Updated naming convention