RESTWS-309: Renamed resources