Updated naming conventions