Add (and revive) more about naming and descriptions