changing the model to make sure the naming is following the standard