renames.
Merge pull request #103 from continuuity/feature/renames

renames.