changed the naming convention