3 files changed, 8 insertions, 6 deletions
diff --git a/lib/diameter/src/app/diameter_gen_base_rfc3588.dia b/lib/diameter/src/app/diameter_gen_base_rfc3588.dia
index 4a12e21acd..4c14ee7575 100644
--- a/lib/diameter/src/app/diameter_gen_base_rfc3588.dia
+++ b/lib/diameter/src/app/diameter_gen_base_rfc3588.dia
@@ -340,7 +340,7 @@
    GRANT_AND_STORE                             2
    GRANT_AND_LOSE                              3
 
-@result_code Result-Code
+@define Result-Code
 
 ;; 7.1.1.  Informational
    DIAMETER_MULTI_ROUND_AUTH         1001
diff --git a/lib/diameter/src/compiler/diameter_codegen.erl b/lib/diameter/src/compiler/diameter_codegen.erl
index a33b07a3d3..0fd4a0b301 100644
--- a/lib/diameter/src/compiler/diameter_codegen.erl
+++ b/lib/diameter/src/compiler/diameter_codegen.erl
@@ -707,9 +707,9 @@ gen_hrl(Path, Mod, Spec) ->
     write("ENUM Macros",
           Fd,
           m_enums(PREFIX, false, get_value(enums, Spec))),
-    write("RESULT CODE Macros",
+    write("DEFINE Macros",
           Fd,
-          m_enums(PREFIX, false, get_value(result_codes, Spec))),
+          m_enums(PREFIX, false, get_value(defines, Spec))),
 
     lists:foreach(fun({M,Es}) ->
                           write("ENUM Macros from " ++ atom_to_list(M),
diff --git a/lib/diameter/src/compiler/diameter_spec_util.erl b/lib/diameter/src/compiler/diameter_spec_util.erl
index b60886b678..e9221ed00a 100644
--- a/lib/diameter/src/compiler/diameter_spec_util.erl
+++ b/lib/diameter/src/compiler/diameter_spec_util.erl
@@ -204,9 +204,11 @@ chunk({avp_vendor_id = T, [{number, I}], Body}, Dict) ->
 chunk({enum, [N], Str}, Dict) ->
     append(enums, {atomize(N), parse_enums(Str)}, Dict);
 
-%% result_codes -> [{ResultName, [{Value, Name}, ...]}, ...]
-chunk({result_code, [N], Str}, Dict) ->
-    append(result_codes, {atomize(N), parse_enums(Str)}, Dict);
+%% defines -> [{DefineName, [{Value, Name}, ...]}, ...]
+chunk({define, [N], Str}, Dict) ->
+    append(defines, {atomize(N), parse_enums(Str)}, Dict);
+chunk({result_code, [_] = N, Str}, Dict) ->  %% backwards compatibility
+    chunk({define, N, Str}, Dict);
 
 %% commands -> [{Name, Abbrev}, ...]
 chunk({commands = T, [], Body}, Dict) ->