Changed the naming conventions to reduce the amount of underscores used