More naming convention updates