Changing to REST naming