Various renames and improvements.