diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/analysis/OperandReferenceAnalyzer.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/analysis/OperandReferenceAnalyzer.java
index 4f78a810fa..fec6f20506 100644
--- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/analysis/OperandReferenceAnalyzer.java
+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/analysis/OperandReferenceAnalyzer.java
@@ -192,7 +192,7 @@ public class OperandReferenceAnalyzer extends AbstractAnalyzer {
 
 		processorAlignment = program.getLanguage().getInstructionAlignment();
 
-		externalBlock = program.getMemory().getBlock("EXTERNAL");
+		externalBlock = program.getMemory().getBlock(MemoryBlock.EXTERNAL_BLOCK_NAME);
 
 		newCodeFound = false;
 		int count = NOTIFICATION_INTERVAL;
diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion/CoffLoader.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion/CoffLoader.java
index d2d84777a1..1157da24c1 100644
--- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion/CoffLoader.java
+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion/CoffLoader.java
@@ -363,7 +363,8 @@ public class CoffLoader extends AbstractLibrarySupportLoader {
 		if (!externalAddressStart.equals(externalAddress)) {
 			long size = externalAddress.subtract(externalAddressStart);
 			try {
-				MemoryBlock block = program.getMemory().createUninitializedBlock("EXTERNAL",
+				MemoryBlock block = program.getMemory()
+						.createUninitializedBlock(MemoryBlock.EXTERNAL_BLOCK_NAME,
 					externalAddressStart, size, false);
 
 				// assume any value in external is writable.
diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion/ElfProgramBuilder.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion/ElfProgramBuilder.java
index cd7ad49be8..fe835b4dc1 100644
--- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion/ElfProgramBuilder.java
+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion/ElfProgramBuilder.java
@@ -1133,8 +1133,8 @@ class ElfProgramBuilder extends MemorySectionResolver implements ElfLoadHelper {
 	}
 
 	/**
-	 * Create EXTERNAL memory block based upon start of {@link #freeAddressRange} and the
-	 * current {@link #nextFreeAddress}.
+	 * Create EXTERNAL memory block based upon {@link #externalBlockLimits} and
+	 * {@link #lastExternalBlockEntryAddress}.
 	 */
 	private void createExternalBlock() {
 		if (lastExternalBlockEntryAddress == null) {
@@ -1144,7 +1144,8 @@ class ElfProgramBuilder extends MemorySectionResolver implements ElfLoadHelper {
 		long size = lastExternalBlockEntryAddress.subtract(externalBlockAddress) + 1;
 		try {
 			MemoryBlock block =
-				memory.createUninitializedBlock("EXTERNAL", externalBlockAddress, size, false);
+				memory.createUninitializedBlock(MemoryBlock.EXTERNAL_BLOCK_NAME,
+					externalBlockAddress, size, false);
 
 			// assume any value in external is writable.
 			block.setWrite(true);
diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion/MachoProgramBuilder.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion/MachoProgramBuilder.java
index 20a8f12c5c..e77ad1cf8d 100644
--- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion/MachoProgramBuilder.java
+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion/MachoProgramBuilder.java
@@ -607,8 +607,8 @@ public class MachoProgramBuilder {
 		}
 		Address start = getAddress();
 		try {
-			MemoryBlock block = memory.createUninitializedBlock("EXTERNAL", start,
-				undefinedSymbols.size() * machoHeader.getAddressSize(), false);
+			MemoryBlock block = memory.createUninitializedBlock(MemoryBlock.EXTERNAL_BLOCK_NAME,
+				start, undefinedSymbols.size() * machoHeader.getAddressSize(), false);
 			// assume any value in external is writable.
 			block.setWrite(true);
 			block.setSourceName(BLOCK_SOURCE_NAME);
diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion/OmfLoader.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion/OmfLoader.java
index 1d2a0f7cc8..4c28e73fab 100644
--- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion/OmfLoader.java
+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion/OmfLoader.java
@@ -524,8 +524,9 @@ public class OmfLoader extends AbstractLibrarySupportLoader {
 		if (!externalAddressStart.equals(externalAddress)) {
 			long size = externalAddress.subtract(externalAddressStart);
 			try {
-				MemoryBlock block = program.getMemory().createUninitializedBlock("EXTERNAL",
-					externalAddressStart, size, false);
+				MemoryBlock block = program.getMemory()
+						.createUninitializedBlock(MemoryBlock.EXTERNAL_BLOCK_NAME,
+							externalAddressStart, size, false);
 
 				// assume any value in external is writable.
 				block.setWrite(true);
diff --git a/Ghidra/Features/Decompiler/src/main/java/ghidra/app/cmd/function/DecompilerParallelConventionAnalysisCmd.java b/Ghidra/Features/Decompiler/src/main/java/ghidra/app/cmd/function/DecompilerParallelConventionAnalysisCmd.java
index 04fc2bc079..4933be7c69 100644
--- a/Ghidra/Features/Decompiler/src/main/java/ghidra/app/cmd/function/DecompilerParallelConventionAnalysisCmd.java
+++ b/Ghidra/Features/Decompiler/src/main/java/ghidra/app/cmd/function/DecompilerParallelConventionAnalysisCmd.java
@@ -25,6 +25,7 @@ import ghidra.program.model.lang.CompilerSpec;
 import ghidra.program.model.lang.PrototypeModel;
 import ghidra.program.model.listing.Function;
 import ghidra.program.model.listing.Program;
+import ghidra.program.model.mem.MemoryBlock;
 import ghidra.program.model.pcode.HighFunction;
 import ghidra.program.model.symbol.*;
 import ghidra.util.Msg;
@@ -111,7 +112,7 @@ public class DecompilerParallelConventionAnalysisCmd extends BackgroundCommand {
 	 */
 	private boolean funcIsExternalGlue(Function func) {
 		String blockName = program.getMemory().getBlock(func.getEntryPoint()).getName();
-		return (blockName.equals("EXTERNAL") || blockName.equals(".plt") ||
+		return (blockName.equals(MemoryBlock.EXTERNAL_BLOCK_NAME) || blockName.equals(".plt") ||
 			blockName.equals("__stub_helper"));
 	}
 
diff --git a/Ghidra/Features/Decompiler/src/main/java/ghidra/app/cmd/function/DecompilerParameterIdCmd.java b/Ghidra/Features/Decompiler/src/main/java/ghidra/app/cmd/function/DecompilerParameterIdCmd.java
index 752b31ce7d..187efb7ea7 100644
--- a/Ghidra/Features/Decompiler/src/main/java/ghidra/app/cmd/function/DecompilerParameterIdCmd.java
+++ b/Ghidra/Features/Decompiler/src/main/java/ghidra/app/cmd/function/DecompilerParameterIdCmd.java
@@ -31,6 +31,7 @@ import ghidra.program.model.data.DataType;
 import ghidra.program.model.data.VoidDataType;
 import ghidra.program.model.lang.CompilerSpec;
 import ghidra.program.model.listing.*;
+import ghidra.program.model.mem.MemoryBlock;
 import ghidra.program.model.pcode.*;
 import ghidra.program.model.symbol.SourceType;
 import ghidra.program.model.util.AcyclicCallGraphBuilder;
@@ -116,7 +117,7 @@ public class DecompilerParameterIdCmd extends BackgroundCommand {
 	 */
 	private boolean funcIsExternalGlue(Function func) {
 		String blockName = program.getMemory().getBlock(func.getEntryPoint()).getName();
-		return (blockName.equals("EXTERNAL") || blockName.equals(".plt") ||
+		return (blockName.equals(MemoryBlock.EXTERNAL_BLOCK_NAME) || blockName.equals(".plt") ||
 			blockName.equals("__stub_helper"));
 	}
 
diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/util/PseudoDisassembler.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/util/PseudoDisassembler.java
index ba1c3d61df..d088ef61ab 100644
--- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/util/PseudoDisassembler.java
+++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/util/PseudoDisassembler.java
@@ -629,7 +629,7 @@ public class PseudoDisassembler {
 					//    it is probably a JUMP to an external function.
 					MemoryBlock block = memory.getBlock(target);
 					if (block == null || block.isInitialized() ||
-						!block.getName().equals("EXTERNAL")) {
+						!block.getName().equals(MemoryBlock.EXTERNAL_BLOCK_NAME)) {
 						return false;
 					}
 					targetList.remove(target);
diff --git a/Ghidra/Processors/ARM/src/main/java/ghidra/app/plugin/core/analysis/ArmAnalyzer.java b/Ghidra/Processors/ARM/src/main/java/ghidra/app/plugin/core/analysis/ArmAnalyzer.java
index d5817c1b9c..9e8d9c9730 100644
--- a/Ghidra/Processors/ARM/src/main/java/ghidra/app/plugin/core/analysis/ArmAnalyzer.java
+++ b/Ghidra/Processors/ARM/src/main/java/ghidra/app/plugin/core/analysis/ArmAnalyzer.java
@@ -810,7 +810,7 @@ public class ArmAnalyzer extends ConstantPropagationAnalyzer {
 		// something computed it into the memory
 		MemoryBlock block = program.getMemory().getBlock(target);
 		if (block == null || !block.isExecute() || !block.isInitialized() ||
-			block.getName().equals("EXTERNAL")) {
+			block.getName().equals(MemoryBlock.EXTERNAL_BLOCK_NAME)) {
 			return;
 		}
 		
diff --git a/Ghidra/Processors/MIPS/src/main/java/ghidra/app/plugin/core/analysis/MipsAddressAnalyzer.java b/Ghidra/Processors/MIPS/src/main/java/ghidra/app/plugin/core/analysis/MipsAddressAnalyzer.java
index a103535a6b..e240ca3429 100644
--- a/Ghidra/Processors/MIPS/src/main/java/ghidra/app/plugin/core/analysis/MipsAddressAnalyzer.java
+++ b/Ghidra/Processors/MIPS/src/main/java/ghidra/app/plugin/core/analysis/MipsAddressAnalyzer.java
@@ -505,7 +505,7 @@ public class MipsAddressAnalyzer extends ConstantPropagationAnalyzer {
 		if (addr != null) {
 			MemoryBlock block = program.getMemory().getBlock(addr);
 			if (block == null || !block.isExecute() || !block.isInitialized() ||
-				block.getName().equals("EXTERNAL")) {
+				block.getName().equals(MemoryBlock.EXTERNAL_BLOCK_NAME)) {
 				return addr;
 			}