diff --git a/SPIRV/GlslangToSpv.cpp b/SPIRV/GlslangToSpv.cpp
index 045b85644c2268eb95b07f6c75be81cf2d7a801a..489fe8fe747fa48543670e6fc132f53d58ca075b 100755
--- a/SPIRV/GlslangToSpv.cpp
+++ b/SPIRV/GlslangToSpv.cpp
@@ -1008,8 +1008,8 @@ bool TGlslangToSpvTraverser::visitAggregate(glslang::TVisit visit, glslang::TInt
         break;
 
     case glslang::EOpFma:
-    case glslang::EFrexp:
-    case glslang::ELdexp:
+    case glslang::EOpFrexp:
+    case glslang::EOpLdexp:
         spv::MissingFunctionality("fma/frexp/ldexp aggregate");
         break;
 
diff --git a/glslang/Include/intermediate.h b/glslang/Include/intermediate.h
index 35092967c48764c5ea1e3d09f920710e76731afa..103f0df36febe8416348dc022c9d8766b8bf3b0f 100644
--- a/glslang/Include/intermediate.h
+++ b/glslang/Include/intermediate.h
@@ -187,8 +187,8 @@ enum TOperator {
 
     EOpFma,
 
-    EFrexp,
-    ELdexp,
+    EOpFrexp,
+    EOpLdexp,
 
     EOpFloatBitsToInt,
     EOpFloatBitsToUint,
diff --git a/glslang/MachineIndependent/Initialize.cpp b/glslang/MachineIndependent/Initialize.cpp
index 31fdae0dd7438f311def426f5703e0004a36e543..0ea99f0c5e89763c17313ae40771273c9aef8fce 100644
--- a/glslang/MachineIndependent/Initialize.cpp
+++ b/glslang/MachineIndependent/Initialize.cpp
@@ -3219,8 +3219,8 @@ void IdentifyBuiltIns(int version, EProfile profile, EShLanguage language, TSymb
     symbolTable.relateToOperator("atomicCounter",          EOpAtomicCounter);
 
     symbolTable.relateToOperator("fma",               EOpFma);
-    symbolTable.relateToOperator("frexp",             EFrexp);
-    symbolTable.relateToOperator("ldexp",             ELdexp);
+    symbolTable.relateToOperator("frexp",             EOpFrexp);
+    symbolTable.relateToOperator("ldexp",             EOpLdexp);
     symbolTable.relateToOperator("uaddCarry",         EOpAddCarry);
     symbolTable.relateToOperator("usubBorrow",        EOpSubBorrow);
     symbolTable.relateToOperator("umulExtended",      EOpUMulExtended);
diff --git a/glslang/MachineIndependent/intermOut.cpp b/glslang/MachineIndependent/intermOut.cpp
index 156557ded2d78f8a576cfd4a9c7eba6d62f167f7..5c302b9799f1bb07039c420d99c877f263da56e8 100644
--- a/glslang/MachineIndependent/intermOut.cpp
+++ b/glslang/MachineIndependent/intermOut.cpp
@@ -473,8 +473,8 @@ bool TOutputTraverser::visitAggregate(TVisit /* visit */, TIntermAggregate* node
     case EOpBitfieldInsert:             out.debug << "bitfieldInsert";        break;
 
     case EOpFma:                        out.debug << "fma";                   break;
-    case EFrexp:                        out.debug << "frexp";                 break;
-    case ELdexp:                        out.debug << "ldexp";                 break;
+    case EOpFrexp:                        out.debug << "frexp";                 break;
+    case EOpLdexp:                        out.debug << "ldexp";                 break;
 
     default: out.debug.message(EPrefixError, "Bad aggregation op");
     }