Updated naming scheme for consistency