Correcting some irregular capitalisation and coding standards issues