Fixed more of the naming convention