Updated naming scheme