diff --git a/config/ePO-default/config-parameters.xsl b/config/ePO-default/config-parameters.xsl
index d0db3a8b..86bbd524 100644
--- a/config/ePO-default/config-parameters.xsl
+++ b/config/ePO-default/config-parameters.xsl
@@ -54,7 +54,7 @@
 
     <!-- types of elements and names for attribute types that are acceptable to produce object properties -->
     <xsl:variable name="acceptableTypesForObjectProperties"
-        select="('epo:Quantity', 'epo:Measure', 'epo:Identifier', 'epo:Amount')"/>
+        select="('epo:Identifier', 'rdfs:Literal')"/>
 <!--    the type of attributes which takes values from a controlled list-->
     <xsl:variable name="controlledListType" select="'epo:Code'"/>
     <!-- Acceptable stereotypes -->
diff --git a/src/common/utils.xsl b/src/common/utils.xsl
index d6b6cfa0..11bfd83d 100644
--- a/src/common/utils.xsl
+++ b/src/common/utils.xsl
@@ -260,6 +260,7 @@
         <xsl:param name="isDefaultNamespaceContextualised" as="xs:boolean"/>
 
         <xsl:variable name="localName" select="f:getLocalSegmentForElements($attribute)"/>
+        <xsl:variable name="prefix" select="fn:substring-before($attribute/@name, ':')"/>
         <xsl:variable name="expandedLocalName"
             select="
                 if (substring($localName, 1, 1) = fn:upper-case(substring($localName, 1, 1))) then
@@ -268,7 +269,7 @@
                     $localName
                 "/>
         <xsl:sequence
-            select="f:buildURIFromNode($attribute, $expandedLocalName, $isPascalCase, $isDefaultNamespaceContextualised)"
+            select="f:buildURIFromNode($attribute, fn:concat($prefix,':',$expandedLocalName), $isPascalCase, $isDefaultNamespaceContextualised)"
         />
     </xsl:function>