Schemas: Refactor to our naming scheme.