Renamed schemas for consistency