CMS-1820 Convert content_generateName to use value objects