Fixing case convention, so many commits