tree a3021f957ab42c8a05bbb163062c1075dadefc31
parent 6c56f5e9773c2a90b4562f5df5edcec252c18ab4
author Jonathan Hart <jono@onlab.us> 1447781456 -0800
committer Gerrit Code Review <gerrit@onlab.us> 1447788084 +0000

Addressed some more naming issues throughout the code.

Change-Id: Id679540d55075d902283ad0e2e836b6517752784