Naming conventions added