Naming conventions updated