Fixed portions which were missed on renaming