Renamed schemas to be in line with convention