More naming convention modifications