Add naming conventions