Fixed leftovers from renaming