diff --git a/conf/solr/8.11.1/schema.xml b/conf/solr/8.11.1/schema.xml
index b0d4327d495..63312ab5d40 100644
--- a/conf/solr/8.11.1/schema.xml
+++ b/conf/solr/8.11.1/schema.xml
@@ -262,8 +262,8 @@
     <field name="collectionMode" type="text_en" multiValued="true" stored="true" indexed="true"/>
     <field name="collectorTraining" type="text_en" multiValued="false" stored="true" indexed="true"/>
     <field name="workflowType" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="codeRepository" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="documentation" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="workflowCodeRepository" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="workflowDocumentation" type="text_en" multiValued="true" stored="true" indexed="true"/>
     <field name="contributor" type="text_en" multiValued="true" stored="true" indexed="true"/>
     <field name="contributorName" type="text_en" multiValued="true" stored="true" indexed="true"/>
     <field name="contributorType" type="text_en" multiValued="true" stored="true" indexed="true"/>
@@ -502,8 +502,8 @@
     <copyField source="collectionMode" dest="_text_" maxChars="3000"/>
     <copyField source="collectorTraining" dest="_text_" maxChars="3000"/>
     <copyField source="workflowType" dest="_text_" maxChars="3000"/>
-    <copyField source="codeRepository" dest="_text_" maxChars="3000"/>
-    <copyField source="documentation" dest="_text_" maxChars="3000"/>
+    <copyField source="workflowCodeRepository" dest="_text_" maxChars="3000"/>
+    <copyField source="workflowDocumentation" dest="_text_" maxChars="3000"/>
     <copyField source="contributor" dest="_text_" maxChars="3000"/>
     <copyField source="contributorName" dest="_text_" maxChars="3000"/>
     <copyField source="contributorType" dest="_text_" maxChars="3000"/>
diff --git a/scripts/api/data/metadatablocks/computational_workflow.tsv b/scripts/api/data/metadatablocks/computational_workflow.tsv
index 16bd42330d2..aa5d9de656e 100644
--- a/scripts/api/data/metadatablocks/computational_workflow.tsv
+++ b/scripts/api/data/metadatablocks/computational_workflow.tsv
@@ -2,8 +2,8 @@
 	computationalworkflow		Computational Workflow Metadata
 #datasetField	name	title	description	watermark	 fieldType	displayOrder	displayFormat	advancedSearchField	allowControlledVocabulary	allowmultiples	facetable	displayoncreate	required	parent	metadatablock_id	termURI
 	workflowType	Computational Workflow Type	The kind of Computational Workflow, which is designed to compose and execute a series of computational or data manipulation steps in a scientific application		text	0		TRUE	TRUE	TRUE	TRUE	TRUE	FALSE		computationalworkflow
-	codeRepository	External Code Repository URL	A link to the repository where the un-compiled, human readable code and related code is located (e.g. SVN, GitHub, CodePlex, institutional GitLab instance)	https://...	url	1		FALSE	FALSE	TRUE	FALSE	TRUE	FALSE		computationalworkflow
-	documentation	Documentation	A link (URL) to the documentation or text describing the Computational Workflow and its use		textbox	2		FALSE	FALSE	TRUE	FALSE	TRUE	FALSE		computationalworkflow
+	workflowCodeRepository	External Code Repository URL	A link to the repository where the un-compiled, human readable code and related code is located (e.g. SVN, GitHub, CodePlex, institutional GitLab instance)	https://...	url	1		FALSE	FALSE	TRUE	FALSE	TRUE	FALSE		computationalworkflow
+	workflowDocumentation	Documentation	A link (URL) to the documentation or text describing the Computational Workflow and its use		textbox	2		FALSE	FALSE	TRUE	FALSE	TRUE	FALSE		computationalworkflow
 #controlledVocabulary	DatasetField	Value	identifier	displayOrder
 	workflowType	Common Workflow Language (CWL)	workflowtype_cwl	1
 	workflowType	Workflow Description Language (WDL)	workflowtype_wdl	2
diff --git a/src/main/java/propertyFiles/computationalworkflow.properties b/src/main/java/propertyFiles/computationalworkflow.properties
index 13214b4230f..7d15f52eec8 100644
--- a/src/main/java/propertyFiles/computationalworkflow.properties
+++ b/src/main/java/propertyFiles/computationalworkflow.properties
@@ -4,12 +4,12 @@ metadatablock.displayFacet=Computational Workflow
 datasetfieldtype.workflowType.title=Workflow Type
 datasetfieldtype.workflowType.description=The kind of Computational Workflow, which is designed to compose and execute a series of computational or data manipulation steps in a scientific application
 datasetfieldtype.workflowType.watermark=
-datasetfieldtype.codeRepository.title=External Code Repository URL
-datasetfieldtype.codeRepository.description=A link to another public repository where the un-compiled, human-readable code and related code is also located (e.g., SVN, GitHub, GitLab, CodePlex)
-datasetfieldtype.codeRepository.watermark=https://...
-datasetfieldtype.documentation.title=Documentation
-datasetfieldtype.documentation.description=A link (URL) to the documentation or text describing the Computational Workflow and its use
-datasetfieldtype.documentation.watermark=
+datasetfieldtype.workflowCodeRepository.title=External Code Repository URL
+datasetfieldtype.workflowCodeRepository.description=A link to another public repository where the un-compiled, human-readable code and related code is also located (e.g., SVN, GitHub, GitLab, CodePlex)
+datasetfieldtype.workflowCodeRepository.watermark=https://...
+datasetfieldtype.workflowDocumentation.title=Documentation
+datasetfieldtype.workflowDocumentation.description=A link (URL) to the documentation or text describing the Computational Workflow and its use
+datasetfieldtype.workflowDocumentation.watermark=
 controlledvocabulary.workflowType.common_workflow_language_(cwl)=Common Workflow Language (CWL)
 controlledvocabulary.workflowType.workflow_description_language_(wdl)=Workflow Description Language (WDL)
 controlledvocabulary.workflowType.nextflow=Nextflow