Tweaks to naming