Merge pull request #28 from google/fixNaming

Fix naming