diff --git a/build/helper/metadata_add_all.py b/build/helper/metadata_add_all.py
index a46d69c39..69132a934 100644
--- a/build/helper/metadata_add_all.py
+++ b/build/helper/metadata_add_all.py
@@ -132,10 +132,10 @@ def _add_complex_array_representation(parameter):
         parameter['complex_array_representation'] = None
 
 
-def _add_array_dimension(parameter):
-    '''Adds a array_dimension parameter to the metadata for multi dimensional arrays'''
-    if 'array_dimension' not in parameter:
-        parameter['array_dimension'] = 1
+def _add_array_dimensions(parameter):
+    '''Adds a array_dimensions parameter to the metadata for multi dimensional arrays'''
+    if 'array_dimensions' not in parameter:
+        parameter['array_dimensions'] = 1
 
 
 def _add_numpy_info(parameter, parameters, config):
@@ -463,7 +463,7 @@ def add_all_function_metadata(functions, config):
             _add_ctypes_variable_name(p)
             _add_ctypes_type(p, config)
             _add_complex_array_representation(p)
-            _add_array_dimension(p)
+            _add_array_dimensions(p)
             _add_numpy_info(p, functions[f]['parameters'], config)
             _add_default_value_name(p)
             _add_default_value_name_for_docs(p, config['module_name'])
diff --git a/build/templates/session.py/numpy_write_method.py.mako b/build/templates/session.py/numpy_write_method.py.mako
index 36fa97aad..e545e6a5c 100644
--- a/build/templates/session.py/numpy_write_method.py.mako
+++ b/build/templates/session.py/numpy_write_method.py.mako
@@ -30,8 +30,8 @@
             raise TypeError('${parameter['python_name']} must be in C-order')
         if ${parameter['python_name']}.dtype is not numpy.dtype('${parameter['numpy_type']}'):
             raise TypeError('${parameter['python_name']} must be numpy.ndarray of dtype=${parameter['numpy_type']}, is ' + str(${parameter['python_name']}.dtype))
-        if ${parameter['python_name']}.ndim != ${parameter['array_dimension']}:
-            raise TypeError('${parameter['python_name']} must be numpy.ndarray of dimension=${parameter['array_dimension']}, is ' + str(${parameter['python_name']}.ndim))
+        if ${parameter['python_name']}.ndim != ${parameter['array_dimensions']}:
+            raise TypeError('${parameter['python_name']} must be numpy.ndarray of dimension=${parameter['array_dimensions']}, is ' + str(${parameter['python_name']}.ndim))
 % endfor
 % for p in helper.filter_parameters(parameters, helper.ParameterUsageOptions.INTERPRETER_METHOD_CALL):
 %   if 'python_api_converter_name' in p:
diff --git a/build/unit_tests/test_metadata_add_all.py b/build/unit_tests/test_metadata_add_all.py
index 83188140a..fdbf8e128 100644
--- a/build/unit_tests/test_metadata_add_all.py
+++ b/build/unit_tests/test_metadata_add_all.py
@@ -260,7 +260,7 @@ def _compare_dicts(actual, expected):
                 'use_in_python_api': True,
                 'python_name_or_default_for_init': 'vi',
                 'complex_array_representation': None,
-                'array_dimension': 1,
+                'array_dimensions': 1,
             },
             {
                 'ctypes_method_call_snippet': 'name_ctype',
@@ -295,7 +295,7 @@ def _compare_dicts(actual, expected):
                 'use_in_python_api': True,
                 'python_name_or_default_for_init': 'name',
                 'complex_array_representation': None,
-                'array_dimension': 1,
+                'array_dimensions': 1,
             },
             {
                 'ctypes_method_call_snippet': 'pin_data_buffer_size_ctype',
@@ -333,7 +333,7 @@ def _compare_dicts(actual, expected):
                 'use_in_python_api': False,
                 'python_name_or_default_for_init': 'pin_data_buffer_size',
                 'complex_array_representation': None,
-                'array_dimension': 1,
+                'array_dimensions': 1,
             },
             {
                 'ctypes_method_call_snippet': 'python_code_input_ctype',
@@ -371,7 +371,7 @@ def _compare_dicts(actual, expected):
                 'use_in_python_api': True,
                 'python_name_or_default_for_init': 'python_code_input',
                 'complex_array_representation': None,
-                'array_dimension': 1,
+                'array_dimensions': 1,
             },
             {
                 'ctypes_method_call_snippet': 'None if actual_num_pin_data_ctype is None else (ctypes.pointer(actual_num_pin_data_ctype))',
@@ -409,7 +409,7 @@ def _compare_dicts(actual, expected):
                 'use_in_python_api': False,
                 'python_name_or_default_for_init': 'actual_num_pin_data',
                 'complex_array_representation': None,
-                'array_dimension': 1,
+                'array_dimensions': 1,
             },
             {
                 'ctypes_method_call_snippet': 'expected_pin_states_ctype',
@@ -449,7 +449,7 @@ def _compare_dicts(actual, expected):
                 'use_in_python_api': True,
                 'python_name_or_default_for_init': 'expected_pin_states',
                 'complex_array_representation': None,
-                'array_dimension': 1,
+                'array_dimensions': 1,
             },
             {
                 'ctypes_method_call_snippet': 'custom_type_input_ctype',
@@ -487,7 +487,7 @@ def _compare_dicts(actual, expected):
                 'use_in_python_api': True,
                 'python_name_or_default_for_init': 'custom_type_input',
                 'complex_array_representation': None,
-                'array_dimension': 1,
+                'array_dimensions': 1,
             },
             {
                 'ctypes_method_call_snippet': 'None if custom_type_output_ctype is None else (ctypes.pointer(custom_type_output_ctype))',
@@ -525,7 +525,7 @@ def _compare_dicts(actual, expected):
                 'use_in_python_api': True,
                 'python_name_or_default_for_init': 'custom_type_output',
                 'complex_array_representation': None,
-                'array_dimension': 1,
+                'array_dimensions': 1,
             },
             {
                 'ctypes_method_call_snippet': 'custom_type_without_struct_prefix_input_ctype',
@@ -563,7 +563,7 @@ def _compare_dicts(actual, expected):
                 'use_in_python_api': True,
                 'python_name_or_default_for_init': 'custom_type_without_struct_prefix_input',
                 'complex_array_representation': None,
-                'array_dimension': 1,
+                'array_dimensions': 1,
             },
             {
                 'ctypes_method_call_snippet': 'None if custom_type_without_struct_prefix_output_ctype is None else (ctypes.pointer(custom_type_without_struct_prefix_output_ctype))',
@@ -601,7 +601,7 @@ def _compare_dicts(actual, expected):
                 'use_in_python_api': True,
                 'python_name_or_default_for_init': 'custom_type_without_struct_prefix_output',
                 'complex_array_representation': None,
-                'array_dimension': 1,
+                'array_dimensions': 1,
             },
         ],
         'python_name': 'make_a_foo',
@@ -650,7 +650,7 @@ def _compare_dicts(actual, expected):
                 'use_in_python_api': True,
                 'python_name_or_default_for_init': 'vi',
                 'complex_array_representation': None,
-                'array_dimension': 1,
+                'array_dimensions': 1,
             },
             {
                 'ctypes_method_call_snippet': 'status_ctype',
@@ -688,7 +688,7 @@ def _compare_dicts(actual, expected):
                 'use_in_python_api': True,
                 'python_name_or_default_for_init': 'status',
                 'complex_array_representation': None,
-                'array_dimension': 1,
+                'array_dimensions': 1,
             },
             {
                 'ctypes_method_call_snippet': 'data_buffer_size_ctype',
@@ -726,7 +726,7 @@ def _compare_dicts(actual, expected):
                 'use_in_python_api': False,
                 'python_name_or_default_for_init': 'data_buffer_size',
                 'complex_array_representation': None,
-                'array_dimension': 1,
+                'array_dimensions': 1,
             },
             {
                 'ctypes_method_call_snippet': 'data_ctype',
@@ -765,7 +765,7 @@ def _compare_dicts(actual, expected):
                 'use_in_python_api': True,
                 'python_name_or_default_for_init': 'data',
                 'complex_array_representation': None,
-                'array_dimension': 1,
+                'array_dimensions': 1,
             },
         ],
         'documentation': {
diff --git a/src/nifake/metadata/functions.py b/src/nifake/metadata/functions.py
index 1c932816b..b50c9265a 100644
--- a/src/nifake/metadata/functions.py
+++ b/src/nifake/metadata/functions.py
@@ -3023,7 +3023,7 @@
                 'type': 'NIComplexNumber[]',
                 'numpy': True,
                 'use_in_python_api': True,
-                'array_dimension': 3
+                'array_dimensions': 3
             },
         ],
         'python_name': 'function_with_3d_numpy_array_of_numpy_complex128_input_parameter',
diff --git a/src/nirfsg/metadata/functions.py b/src/nirfsg/metadata/functions.py
index e7940f49d..7c57ed382 100644
--- a/src/nirfsg/metadata/functions.py
+++ b/src/nirfsg/metadata/functions.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# This file is generated from NI-RFSG API metadata version 25.8.0d9999
+# This file is generated from NI-RFSG API metadata version 25.8.0d9999 
 functions = {
     'Abort': {
         'codegen_method': 'public',
@@ -1519,7 +1519,7 @@
                 'use_array': False
             },
             {
-                'array_dimension': 3,
+                'array_dimensions': 3,
                 'complex_array_representation': 'complex_number_array',
                 'direction': 'in',
                 'documentation': {
@@ -2005,7 +2005,7 @@
                 'use_in_python_api': True
             },
             {
-                'array_dimension': 3,
+                'array_dimensions': 3,
                 'complex_array_representation': 'complex_number_array',
                 'direction': 'in',
                 'documentation': {
@@ -2079,7 +2079,7 @@
                 'use_in_python_api': True
             },
             {
-                'array_dimension': 2,
+                'array_dimensions': 2,
                 'complex_array_representation': 'complex_number_array',
                 'direction': 'out',
                 'documentation': {
@@ -2673,7 +2673,7 @@
                 'use_in_python_api': True
             },
             {
-                'array_dimension': 2,
+                'array_dimensions': 2,
                 'complex_array_representation': 'complex_number_array',
                 'direction': 'out',
                 'documentation': {