Other necessary changes due to renaming