I have made changes using naming convention