Change the renaming style

Fixes #52