Updated naming and conventions