diff --git a/lib/codegen/meta/base/instructions.py b/lib/codegen/meta/base/instructions.py
index 5efd344c6f..4572c4914b 100644
--- a/lib/codegen/meta/base/instructions.py
+++ b/lib/codegen/meta/base/instructions.py
@@ -245,7 +245,7 @@ Offset = Operand('Offset', offset32, 'Byte offset from base address')
 x = Operand('x', Mem, doc='Value to be stored')
 a = Operand('a', Mem, doc='Value loaded')
 p = Operand('p', iAddr)
-Flags = Operand('Flags', memflags)
+MemFlags = Operand('MemFlags', memflags)
 args = Operand('args', VARIABLE_ARGS, doc='Address arguments')
 
 load = Instruction(
@@ -255,7 +255,7 @@ load = Instruction(
         This is a polymorphic instruction that can load any value type which
         has a memory representation.
         """,
-        ins=(Flags, p, Offset), outs=a, can_load=True)
+        ins=(MemFlags, p, Offset), outs=a, can_load=True)
 
 load_complex = Instruction(
         'load_complex', r"""
@@ -264,7 +264,7 @@ load_complex = Instruction(
         This is a polymorphic instruction that can load any value type which
         has a memory representation.
         """,
-        ins=(Flags, args, Offset), outs=a, can_load=True)
+        ins=(MemFlags, args, Offset), outs=a, can_load=True)
 
 store = Instruction(
         'store', r"""
@@ -273,7 +273,7 @@ store = Instruction(
         This is a polymorphic instruction that can store any value type with a
         memory representation.
         """,
-        ins=(Flags, x, p, Offset), can_store=True)
+        ins=(MemFlags, x, p, Offset), can_store=True)
 
 store_complex = Instruction(
         'store_complex', r"""
@@ -282,7 +282,7 @@ store_complex = Instruction(
         This is a polymorphic instruction that can store any value type with a
         memory representation.
         """,
-        ins=(Flags, x, args, Offset), can_store=True)
+        ins=(MemFlags, x, args, Offset), can_store=True)
 
 
 iExt8 = TypeVar(
@@ -297,7 +297,7 @@ uload8 = Instruction(
 
         This is equivalent to ``load.i8`` followed by ``uextend``.
         """,
-        ins=(Flags, p, Offset), outs=a, can_load=True)
+        ins=(MemFlags, p, Offset), outs=a, can_load=True)
 
 uload8_complex = Instruction(
         'uload8_complex', r"""
@@ -305,7 +305,7 @@ uload8_complex = Instruction(
 
         This is equivalent to ``load.i8`` followed by ``uextend``.
         """,
-        ins=(Flags, args, Offset), outs=a, can_load=True)
+        ins=(MemFlags, args, Offset), outs=a, can_load=True)
 
 sload8 = Instruction(
         'sload8', r"""
@@ -313,7 +313,7 @@ sload8 = Instruction(
 
         This is equivalent to ``load.i8`` followed by ``uextend``.
         """,
-        ins=(Flags, p, Offset), outs=a, can_load=True)
+        ins=(MemFlags, p, Offset), outs=a, can_load=True)
 
 sload8_complex = Instruction(
         'sload8_complex', r"""
@@ -321,7 +321,7 @@ sload8_complex = Instruction(
 
         This is equivalent to ``load.i8`` followed by ``uextend``.
         """,
-        ins=(Flags, args, Offset), outs=a, can_load=True)
+        ins=(MemFlags, args, Offset), outs=a, can_load=True)
 
 istore8 = Instruction(
         'istore8', r"""
@@ -329,7 +329,7 @@ istore8 = Instruction(
 
         This is equivalent to ``ireduce.i8`` followed by ``store.i8``.
         """,
-        ins=(Flags, x, p, Offset), can_store=True)
+        ins=(MemFlags, x, p, Offset), can_store=True)
 
 istore8_complex = Instruction(
         'istore8_complex', r"""
@@ -337,7 +337,7 @@ istore8_complex = Instruction(
 
         This is equivalent to ``ireduce.i8`` followed by ``store.i8``.
         """,
-        ins=(Flags, x, args, Offset), can_store=True)
+        ins=(MemFlags, x, args, Offset), can_store=True)
 
 iExt16 = TypeVar(
         'iExt16', 'An integer type with more than 16 bits',
@@ -351,7 +351,7 @@ uload16 = Instruction(
 
         This is equivalent to ``load.i16`` followed by ``uextend``.
         """,
-        ins=(Flags, p, Offset), outs=a, can_load=True)
+        ins=(MemFlags, p, Offset), outs=a, can_load=True)
 
 uload16_complex = Instruction(
         'uload16_complex', r"""
@@ -359,7 +359,7 @@ uload16_complex = Instruction(
 
         This is equivalent to ``load.i16`` followed by ``uextend``.
         """,
-        ins=(Flags, args, Offset), outs=a, can_load=True)
+        ins=(MemFlags, args, Offset), outs=a, can_load=True)
 
 sload16 = Instruction(
         'sload16', r"""
@@ -367,7 +367,7 @@ sload16 = Instruction(
 
         This is equivalent to ``load.i16`` followed by ``uextend``.
         """,
-        ins=(Flags, p, Offset), outs=a, can_load=True)
+        ins=(MemFlags, p, Offset), outs=a, can_load=True)
 
 sload16_complex = Instruction(
         'sload16_complex', r"""
@@ -375,7 +375,7 @@ sload16_complex = Instruction(
 
         This is equivalent to ``load.i16`` followed by ``uextend``.
         """,
-        ins=(Flags, args, Offset), outs=a, can_load=True)
+        ins=(MemFlags, args, Offset), outs=a, can_load=True)
 
 istore16 = Instruction(
         'istore16', r"""
@@ -383,7 +383,7 @@ istore16 = Instruction(
 
         This is equivalent to ``ireduce.i16`` followed by ``store.i16``.
         """,
-        ins=(Flags, x, p, Offset), can_store=True)
+        ins=(MemFlags, x, p, Offset), can_store=True)
 
 istore16_complex = Instruction(
         'istore16_complex', r"""
@@ -391,7 +391,7 @@ istore16_complex = Instruction(
 
         This is equivalent to ``ireduce.i16`` followed by ``store.i16``.
         """,
-        ins=(Flags, x, args, Offset), can_store=True)
+        ins=(MemFlags, x, args, Offset), can_store=True)
 
 iExt32 = TypeVar(
         'iExt32', 'An integer type with more than 32 bits',
@@ -405,7 +405,7 @@ uload32 = Instruction(
 
         This is equivalent to ``load.i32`` followed by ``uextend``.
         """,
-        ins=(Flags, p, Offset), outs=a, can_load=True)
+        ins=(MemFlags, p, Offset), outs=a, can_load=True)
 
 uload32_complex = Instruction(
         'uload32_complex', r"""
@@ -413,7 +413,7 @@ uload32_complex = Instruction(
 
         This is equivalent to ``load.i32`` followed by ``uextend``.
         """,
-        ins=(Flags, args, Offset), outs=a, can_load=True)
+        ins=(MemFlags, args, Offset), outs=a, can_load=True)
 
 sload32 = Instruction(
         'sload32', r"""
@@ -421,7 +421,7 @@ sload32 = Instruction(
 
         This is equivalent to ``load.i32`` followed by ``uextend``.
         """,
-        ins=(Flags, p, Offset), outs=a, can_load=True)
+        ins=(MemFlags, p, Offset), outs=a, can_load=True)
 
 sload32_complex = Instruction(
         'sload32_complex', r"""
@@ -429,7 +429,7 @@ sload32_complex = Instruction(
 
         This is equivalent to ``load.i32`` followed by ``uextend``.
         """,
-        ins=(Flags, args, Offset), outs=a, can_load=True)
+        ins=(MemFlags, args, Offset), outs=a, can_load=True)
 
 istore32 = Instruction(
         'istore32', r"""
@@ -437,7 +437,7 @@ istore32 = Instruction(
 
         This is equivalent to ``ireduce.i32`` followed by ``store.i32``.
         """,
-        ins=(Flags, x, p, Offset), can_store=True)
+        ins=(MemFlags, x, p, Offset), can_store=True)
 
 istore32_complex = Instruction(
         'istore32_complex', r"""
@@ -445,7 +445,7 @@ istore32_complex = Instruction(
 
         This is equivalent to ``ireduce.i32`` followed by ``store.i32``.
         """,
-        ins=(Flags, x, args, Offset), can_store=True)
+        ins=(MemFlags, x, args, Offset), can_store=True)
 
 x = Operand('x', Mem, doc='Value to be stored')
 a = Operand('a', Mem, doc='Value loaded')