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