Fixed a few overlooked name changes