Add naming convention