change naming convention
modify name conventions