Updated naming schemes