DDF-628: Replaced type name with prefix:type name