changes to naming logic