rename types to plural