changing the naming convention