Name changes and tweaks