Some fixes to names of things