Updated naming, documentation