Changing the models name according to the Coding Guidelines