diff --git a/compiler/globtype.pas b/compiler/globtype.pas
index 9f55c4e2ea..33d7e47e58 100644
--- a/compiler/globtype.pas
+++ b/compiler/globtype.pas
@@ -146,7 +146,7 @@ interface
          cs_zerobasedstrings,
          { i8086 specific }
          cs_force_far_calls,
-         cs_hugeptr_normalization
+         cs_hugeptr_arithmetic_normalization
        );
        tlocalswitches = set of tlocalswitch;
 
diff --git a/compiler/i8086/n8086add.pas b/compiler/i8086/n8086add.pas
index f740996b72..0282fed271 100644
--- a/compiler/i8086/n8086add.pas
+++ b/compiler/i8086/n8086add.pas
@@ -334,7 +334,7 @@ interface
             internalerror(2014070301);
         end;
 
-        if cs_hugeptr_normalization in current_settings.localswitches then
+        if cs_hugeptr_arithmetic_normalization in current_settings.localswitches then
           procname:=procname+'_normalized';
 
         if is_hugepointer(left.resultdef) then
diff --git a/compiler/scandir.pas b/compiler/scandir.pas
index 3a55ce1795..a56dbe0be0 100644
--- a/compiler/scandir.pas
+++ b/compiler/scandir.pas
@@ -1579,7 +1579,7 @@ unit scandir;
             Message(scan_w_hugepointernormalization_not_support);
             exit;
           end;
-        do_localswitch(cs_hugeptr_normalization);
+        do_localswitch(cs_hugeptr_arithmetic_normalization);
       end;
 
     procedure dir_weakpackageunit;