MDL-31989: Renaming schema + minor indentation