diff --git a/README.md b/README.md
index f471b002e08..07ded6fd42f 100644
--- a/README.md
+++ b/README.md
@@ -120,7 +120,7 @@ The `native` property can be one of the following:
 
 Therefore to build all the natives using docker do `mvn process-resources -Dnative=docker`. 
 
-However, the challenge is that dll files on Windows have a timestamp in them. To have reproducible builds, we need to have a reproducible timestamp. Therefore we use the commit time of the commit to derive a timestamp (We use the `SOURCE_DATE_EPOCH` environemnt variable to achieve this, see the [Makefile](native/org.eclipse.cdt.native.serial/jni/Makefile) for more info). Because we want to keep the DLL checked in so that contributors don't need to rebuild it all the time we need a way to have to check in the dll with the same commit time. To do this we use GIT_COMMITTER_DATE. So, after editing and committing your change, you need to rebuild one last time with the commit date and the commit it without changing the commit date again using:
+However, the challenge is that dll files on Windows have a timestamp in them. To have reproducible builds, we need to have a reproducible timestamp. Therefore we use the commit time of the commit to derive a timestamp (We use the `SOURCE_DATE_EPOCH` environemnt variable to achieve this, see the [Makefile](native/org.eclipse.cdt.native.serial/native_src/Makefile) for more info). Because we want to keep the DLL checked in so that contributors don't need to rebuild it all the time we need a way to have to check in the dll with the same commit time. To do this we use GIT_COMMITTER_DATE. So, after editing and committing your change, you need to rebuild one last time with the commit date and the commit it without changing the commit date again using:
 
 1. Edit and commit change
 2. Set DIR to the name of the directory you are working on, e.g. `DIR=native/org.eclipse.cdt.native.serial`
diff --git a/native/org.eclipse.cdt.native.serial/build.properties b/native/org.eclipse.cdt.native.serial/build.properties
index 22cb27bb991..8d185293761 100644
--- a/native/org.eclipse.cdt.native.serial/build.properties
+++ b/native/org.eclipse.cdt.native.serial/build.properties
@@ -5,5 +5,5 @@ bin.includes = META-INF/,\
                os/,\
                about.html,\
                cdt_logo_icon32.png
-src.includes = jni/,\
+src.includes = native_src/,\
                about.html
diff --git a/native/org.eclipse.cdt.native.serial/jni/.gitignore b/native/org.eclipse.cdt.native.serial/native_src/.gitignore
similarity index 100%
rename from native/org.eclipse.cdt.native.serial/jni/.gitignore
rename to native/org.eclipse.cdt.native.serial/native_src/.gitignore
diff --git a/native/org.eclipse.cdt.native.serial/jni/Makefile b/native/org.eclipse.cdt.native.serial/native_src/Makefile
similarity index 100%
rename from native/org.eclipse.cdt.native.serial/jni/Makefile
rename to native/org.eclipse.cdt.native.serial/native_src/Makefile
diff --git a/native/org.eclipse.cdt.native.serial/jni/Readme.md b/native/org.eclipse.cdt.native.serial/native_src/Readme.md
similarity index 100%
rename from native/org.eclipse.cdt.native.serial/jni/Readme.md
rename to native/org.eclipse.cdt.native.serial/native_src/Readme.md
diff --git a/native/org.eclipse.cdt.native.serial/jni/serial.c b/native/org.eclipse.cdt.native.serial/native_src/serial.c
similarity index 100%
rename from native/org.eclipse.cdt.native.serial/jni/serial.c
rename to native/org.eclipse.cdt.native.serial/native_src/serial.c
diff --git a/native/org.eclipse.cdt.native.serial/os/win32/x86_64/serial.dll b/native/org.eclipse.cdt.native.serial/os/win32/x86_64/serial.dll
index 2b1a6fab520..e88734adb7c 100755
Binary files a/native/org.eclipse.cdt.native.serial/os/win32/x86_64/serial.dll and b/native/org.eclipse.cdt.native.serial/os/win32/x86_64/serial.dll differ
diff --git a/native/org.eclipse.cdt.native.serial/pom.xml b/native/org.eclipse.cdt.native.serial/pom.xml
index 38302debf3d..783bad37431 100644
--- a/native/org.eclipse.cdt.native.serial/pom.xml
+++ b/native/org.eclipse.cdt.native.serial/pom.xml
@@ -46,7 +46,7 @@
 								<phase>process-resources</phase>
 								<configuration>
 									<target>
-										<exec executable="make" newenvironment="false" failOnError="true" dir="./jni">
+										<exec executable="make" newenvironment="false" failOnError="true" dir="./native_src">
 											<arg value="rebuild" />
 										</exec>
 									</target>
@@ -79,7 +79,7 @@
 								<configuration>
 									<target>
 										<exec executable="docker" newenvironment="false" failOnError="true">
-										<!-- docker run -\-rm -t -v $(git rev-parse -\-show-toplevel):/work -w /work/$(git rev-parse -\-show-prefix) quay.io/eclipse-cdt/cdt-infra-eclipse-full:latest  make -C jni rebuild -->
+										<!-- docker run -\-rm -t -v $(git rev-parse -\-show-toplevel):/work -w /work/$(git rev-parse -\-show-prefix) quay.io/eclipse-cdt/cdt-infra-eclipse-full:latest  make -C native_src rebuild -->
 											<arg value="run" />
 											<arg value="--rm" />
 											<arg value="-t" />
@@ -90,7 +90,7 @@
 											<arg value="quay.io/eclipse-cdt/cdt-infra-eclipse-full:latest" />
 											<arg value="make" />
 											<arg value="-C" />
-											<arg value="jni" />
+											<arg value="native_src" />
 											<arg value="rebuild" />
 										</exec>
 									</target>
@@ -122,7 +122,7 @@
 								<phase>process-resources</phase>
 								<configuration>
 									<target>
-										<exec executable="make" newenvironment="false" dir="./jni">
+										<exec executable="make" newenvironment="false" dir="./native_src">
 											<arg value="LIBS=../os/linux/x86_64/libserial.so" />
 										</exec>
 									</target>
@@ -136,7 +136,7 @@
 								<phase>clean</phase>
 								<configuration>
 									<target>
-										<exec executable="make" newenvironment="false" dir="./jni">
+										<exec executable="make" newenvironment="false" dir="./native_src">
 											<arg value="LIBS=../os/linux/x86_64/libserial.so" />
 											<arg value="clean" />
 										</exec>
@@ -169,7 +169,7 @@
 								<phase>process-resources</phase>
 								<configuration>
 									<target>
-										<exec executable="make" newenvironment="false" dir="./jni">
+										<exec executable="make" newenvironment="false" dir="./native_src">
 											<arg value="LIBS=../os/linux/ppc64le/libserial.so" />
 										</exec>
 									</target>
@@ -183,7 +183,7 @@
 								<phase>clean</phase>
 								<configuration>
 									<target>
-										<exec executable="make" newenvironment="false" dir="./jni">
+										<exec executable="make" newenvironment="false" dir="./native_src">
 											<arg value="LIBS=../os/linux/ppc64le/libserial.so" />
 											<arg value="clean" />
 										</exec>
diff --git a/releng/scripts/check_code_cleanliness.sh b/releng/scripts/check_code_cleanliness.sh
index 8d5e3a8d792..de61112323f 100755
--- a/releng/scripts/check_code_cleanliness.sh
+++ b/releng/scripts/check_code_cleanliness.sh
@@ -105,10 +105,10 @@ done
 ##
 # Make sure that natives are up to date
 ##
-if test -e native/org.eclipse.cdt.native.serial/jni; then
+if test -e native/org.eclipse.cdt.native.serial/native_src; then
     echo "Rebuilding natives to make sure they match source"
     logfile=$(mktemp /tmp/make-natives-log.XXXXXX)
-    if ! make -C native/org.eclipse.cdt.native.serial/jni rebuild >${logfile} 2>&1; then
+    if ! make -C native/org.eclipse.cdt.native.serial/native_src rebuild >${logfile} 2>&1; then
         echo "Rebuilding of natives failed. The log is part of the artifacts of the build"
         cp ${logfile} make-natives.log
         exit 1