Adjusted Naming Conventions