Variable name changes
Merge pull request #53 from anchor/logging-locking-refinement

Variable name changes, per @christian-marie