Removed mixed case functions

And added some underscores to make things more "salty".