remove XCode :poop: in model headers
fix naming conventions