Renamed traits to WriteQueries and ReadQueries.