Some fixes and a rename to be consistent