CFY-1372 tosca naming convention for types