Renamed grammar to schema