Prep for new version and a bit of cleanup because I'm pedantic about casing.