improvements to naming