Fix some terminology and make this the golden reference