Fixed a couple of errors due to the renaming