Name fixes.
Merge pull request #195 from iceglow/cleanup

Name fixes.