Updated the naming convention