Naming conventions update