More tweaks to naming