Commit before changing name convention

I've decided to change the naming convention to match that of Olivier's
code.