diff --git a/.github/labeler.yml b/.github/labeler.yml
index 8e01eae74..1302d1a7b 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -41,7 +41,7 @@ lang-clean:
   - etc/config/clean.*.properties
   - static/modes/clean-mode.ts
 lang-cobol:
-  - lib/compilers/cobol.js
+  - lib/compilers/gnucobol.js
   - etc/config/cobol.*.properties
   - static/modes/cobol-mode.ts
 lang-cppx:
diff --git a/etc/config/cobol.amazon.properties b/etc/config/cobol.amazon.properties
index 33804a024..63682f11b 100644
--- a/etc/config/cobol.amazon.properties
+++ b/etc/config/cobol.amazon.properties
@@ -1,10 +1,10 @@
-compilers=&cobol
-defaultCompiler=cobol
+compilers=&gnucobol
+defaultCompiler=gnucoboldefault
 
-group.cobol.groupName=COBOL
-group.cobol.compilers=cobol
-group.cobol.isSemVer=true
-group.cobol.baseName=COBOL
-group.cobol.licenseName=GPLv3
-group.cobol.licenseLink=https://sourceforge.net/p/gnucobol/code/HEAD/tree/trunk/COPYING
-compiler.cobol.exe=/opt/compiler-explorer/gnucobol/bin/cobc
+group.gnucobol.groupName=GnuCOBOL
+group.gnucobol.compilers=gnucoboldefault
+group.gnucobol.isSemVer=true
+group.gnucobol.baseName=GnuCOBOL
+group.gnucobol.licenseName=GPLv3
+group.gnucobol.licenseLink=https://sourceforge.net/p/gnucobol/code/HEAD/tree/trunk/COPYING
+compiler.gnucoboldefault.exe=/opt/compiler-explorer/gnucobol/bin/cobc
diff --git a/etc/config/cobol.defaults.properties b/etc/config/cobol.defaults.properties
index 556e85f56..0d535a7ce 100644
--- a/etc/config/cobol.defaults.properties
+++ b/etc/config/cobol.defaults.properties
@@ -1,14 +1,15 @@
 # Default settings for COBOL
-compilers=cobol
-compilerType=cobol
-
+compilers=&gnucobol
+defaultCompiler=gnucoboldefault
+compilerType=gnucobol
 versionFlag=--version
 
-objdumper=objdump
-supportsBinary=true
-supportsBinaryObject=true
-binaryHideFuncRe=^(__.*|_(init|start|fini)|(de)?register_tm_clones|call_gmon_start|frame_dummy|\.plt.*|_dl_relocate_static_pie)$
-supportsLibraryCodeFilter=true
-
-compiler.cobol.name=GNU COBOL
-compiler.cobol.exe=/usr/local/bin/cobc
+group.gnucobol.objdumper=objdump
+group.gnucobol.binaryHideFuncRe=^(__.*|_(init|start|fini)|(de)?register_tm_clones|call_gmon_start|frame_dummy|\.plt.*|_dl_relocate_static_pie)$
+group.gnucobol.supportsBinary=true
+group.gnucobol.supportsBinaryObject=true
+group.gnucobol.supportsLibraryCodeFilter=true
+group.gnucobol.compilers=gnucoboldefault
+group.gnucobol.intelAsm=-A -masm=intel
+compiler.gnucoboldefault.name=GnuCOBOL
+compiler.gnucoboldefault.exe=/usr/local/bin/cobc