Merge pull request #449 from benma/renamings

More Renamings