Changes due to renaming