Fixed schema renaming