LPS-49897 rename to use plural, looks better