Fixes to naming