More tweaks to chart names