diff --git a/doc/OpenSTA.odt b/doc/OpenSTA.odt
index 977ee6df..3173441e 100644
Binary files a/doc/OpenSTA.odt and b/doc/OpenSTA.odt differ
diff --git a/search/Property.cc b/search/Property.cc
index e6ce3a4a..2b7366ca 100644
--- a/search/Property.cc
+++ b/search/Property.cc
@@ -889,7 +889,7 @@ getProperty(const Instance *inst,
 	    Sta *sta)
 {
   auto network = sta->cmdNetwork();
-  LibertyCell *libertyCell = network->libertyCell(inst);
+  LibertyCell *liberty_cell = network->libertyCell(inst);
   if (stringEqual(property, "name"))
     return PropertyValue(network->name(inst));
   else if (stringEqual(property, "full_name"))
@@ -903,15 +903,15 @@ getProperty(const Instance *inst,
   else if (stringEqual(property, "is_hierarchical"))
     return PropertyValue(network->isHierarchical(inst));
   else if (stringEqual(property, "is_buffer"))
-    return PropertyValue(libertyCell && libertyCell->isBuffer());
+    return PropertyValue(liberty_cell && liberty_cell->isBuffer());
   else if (stringEqual(property, "is_clock_gate"))
-    return PropertyValue(libertyCell && libertyCell->isClockGate());
+    return PropertyValue(liberty_cell && liberty_cell->isClockGate());
   else if (stringEqual(property, "is_inverter"))
-    return PropertyValue(libertyCell && libertyCell->isInverter());
+    return PropertyValue(liberty_cell && liberty_cell->isInverter());
   else if (stringEqual(property, "is_macro"))
-    return PropertyValue(libertyCell && libertyCell->isMacro());
+    return PropertyValue(liberty_cell && liberty_cell->isMacro());
   else if (stringEqual(property, "is_memory_cell"))
-    return PropertyValue(libertyCell && libertyCell->isMemory());
+    return PropertyValue(liberty_cell && liberty_cell->isMemory());
   else
     throw PropertyUnknown("instance", property);
 }
@@ -1178,14 +1178,8 @@ getProperty(Clock *clk,
     return PropertyValue(clk->name());
   else if (stringEqual(property, "period"))
     return PropertyValue(clk->period(), sta->units()->timeUnit());
-  else if (stringEqual(property, "sources"))
+  else if (stringEqual(property, "source_pins"))
     return PropertyValue(clk->pins());
-  else if (stringEqual(property, "generated"))
-    return PropertyValue(clk->isGenerated());
-  else if (stringEqual(property, "virtual"))
-    return PropertyValue(clk->isVirtual());
-  else if (stringEqual(property, "propagated"))
-    return PropertyValue(clk->isPropagated());
   else if (stringEqual(property, "is_generated"))
     return PropertyValue(clk->isGenerated());
   else if (stringEqual(property, "is_virtual"))