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

renames.