Changed the naming conventions