naming Conventions

edited the naming conventions