Fixed schema references throughout the code.