Normalize naming (Schema vs. Model)