diff --git a/modules/nwtc-library/src/NWTC_C_Binding.f90 b/modules/nwtc-library/src/NWTC_C_Binding.f90
index 9d5f744ffa..ca3a574710 100644
--- a/modules/nwtc-library/src/NWTC_C_Binding.f90
+++ b/modules/nwtc-library/src/NWTC_C_Binding.f90
@@ -146,9 +146,9 @@ SUBROUTINE StringConvert_C2F(String_C, String_F)
END SUBROUTINE
-FUNCTION RemoveCStringNullChar(String_C, StringLength_C)
- CHARACTER(KIND=C_CHAR), INTENT(IN) :: String_C(StringLength_C)
+FUNCTION RemoveCStringNullChar(StringLength_C, String_C)
INTEGER(C_INT), INTENT(IN) :: StringLength_C
+ CHARACTER(KIND=C_CHAR), INTENT(IN) :: String_C(StringLength_C)
CHARACTER(LEN=StringLength_C) :: RemoveCStringNullChar
integer :: i
@@ -177,10 +177,10 @@ FUNCTION FileNameFromCString(String_C, StringLength_C)
i = MIN(IntfStrLen, StringLength_C)
FileNameFromCString(1:i) = String_C(1:i)
- FileNameFromCString = RemoveCStringNullChar(FileNameFromCString, IntfStrLen)
+ FileNameFromCString = RemoveCStringNullChar(IntfStrLen, FileNameFromCString)
RETURN
END FUNCTION
-END MODULE
\ No newline at end of file
+END MODULE
diff --git a/modules/nwtc-library/tests/test_NWTC_C_Binding.F90 b/modules/nwtc-library/tests/test_NWTC_C_Binding.F90
index 168cb38779..cb1a20ff47 100644
--- a/modules/nwtc-library/tests/test_NWTC_C_Binding.F90
+++ b/modules/nwtc-library/tests/test_NWTC_C_Binding.F90
@@ -182,7 +182,7 @@ subroutine test_RemoveCStringNullChar(error)
integer, parameter :: result_length = test_c_string_len + 10
character(len=result_length) :: result_string
- result_string = RemoveCStringNullChar(test_c_string, test_c_string_len)
+ result_string = RemoveCStringNullChar(test_c_string_len, test_c_string)
call check(error, 0, INDEX(result_string, C_NULL_CHAR))
end subroutine
diff --git a/vs-build/AeroDyn_Inflow_c_binding/AeroDyn_Inflow_c_binding.vfproj b/vs-build/AeroDyn_Inflow_c_binding/AeroDyn_Inflow_c_binding.vfproj
index 968fc4a3b3..14a1c2c145 100644
--- a/vs-build/AeroDyn_Inflow_c_binding/AeroDyn_Inflow_c_binding.vfproj
+++ b/vs-build/AeroDyn_Inflow_c_binding/AeroDyn_Inflow_c_binding.vfproj
@@ -5,7 +5,7 @@
-
+
@@ -15,7 +15,7 @@
-
+
@@ -25,7 +25,7 @@
-
+
@@ -35,7 +35,7 @@
-
+
@@ -45,7 +45,7 @@
-
+
@@ -55,7 +55,7 @@
-
+
@@ -75,7 +75,7 @@
-
+
@@ -85,7 +85,7 @@
-
+
@@ -95,7 +95,7 @@
-
+
@@ -105,7 +105,7 @@
-
+
@@ -115,7 +115,7 @@
-
+
diff --git a/vs-build/HydroDyn_c_binding/HydroDyn_c_binding.vfproj b/vs-build/HydroDyn_c_binding/HydroDyn_c_binding.vfproj
index 88c221495a..bc9116ccf7 100644
--- a/vs-build/HydroDyn_c_binding/HydroDyn_c_binding.vfproj
+++ b/vs-build/HydroDyn_c_binding/HydroDyn_c_binding.vfproj
@@ -5,7 +5,7 @@
-
+
@@ -15,7 +15,7 @@
-
+
@@ -25,7 +25,7 @@
-
+
@@ -35,7 +35,7 @@
-
+
@@ -45,7 +45,7 @@
-
+
@@ -55,7 +55,7 @@
-
+
@@ -65,7 +65,7 @@
-
+
@@ -75,7 +75,7 @@
-
+
diff --git a/vs-build/InflowWind_c_binding/InflowWind_c_binding.vfproj b/vs-build/InflowWind_c_binding/InflowWind_c_binding.vfproj
index 2f0e72a9bf..192df54c69 100644
--- a/vs-build/InflowWind_c_binding/InflowWind_c_binding.vfproj
+++ b/vs-build/InflowWind_c_binding/InflowWind_c_binding.vfproj
@@ -5,7 +5,7 @@
-
+
@@ -15,7 +15,7 @@
-
+
@@ -25,7 +25,7 @@
-
+
@@ -35,7 +35,7 @@
-
+
@@ -45,7 +45,7 @@
-
+
@@ -55,7 +55,7 @@
-
+
@@ -65,7 +65,7 @@
-
+
@@ -75,7 +75,7 @@
-
+
diff --git a/vs-build/MoorDyn_c_binding/MoorDyn_c_binding.vfproj b/vs-build/MoorDyn_c_binding/MoorDyn_c_binding.vfproj
index 3055b305fd..45710d681e 100644
--- a/vs-build/MoorDyn_c_binding/MoorDyn_c_binding.vfproj
+++ b/vs-build/MoorDyn_c_binding/MoorDyn_c_binding.vfproj
@@ -5,7 +5,7 @@
-
+
@@ -15,7 +15,7 @@
-
+
@@ -25,7 +25,7 @@
-
+
@@ -35,7 +35,7 @@
-
+
@@ -45,7 +45,7 @@
-
+
@@ -55,7 +55,7 @@
-
+
@@ -65,7 +65,7 @@
-
+
@@ -75,7 +75,7 @@
-
+