Updated naming and references