Renames and tweaks as suggested.