Mopping up a few more renames and cleanup.