Rename two methods.
Move the bodies to their proper location.
Merge pull request #282 from pleroy/Renaming

Rename two improperly named methods and move body files to the right location
Merge.