Don't allow fast forwards even on single commit branches.
Rename more files.
Merge branch 'feature/rename' into develop