naming convention

updated naming conventions