Some fixes and name changes