fixes to naming