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

renames.