Found more things that needed to change for the rename.