Minor corrections, comments
Naming Convention changes.