diff --git a/plugin/src/main/java/com/github/sbt/jni/javah/util/Utils.java b/plugin/src/main/java/com/github/sbt/jni/javah/util/Utils.java
index 1beb38ea..5a733d56 100644
--- a/plugin/src/main/java/com/github/sbt/jni/javah/util/Utils.java
+++ b/plugin/src/main/java/com/github/sbt/jni/javah/util/Utils.java
@@ -53,8 +53,6 @@ public static String mangleName(String name) {
             char ch = name.charAt(i);
             if (ch == '.') {
                 builder.append('_');
-            } else if (ch == '$') {
-                builder.append("__");
             } else if (ch == '_') {
                 builder.append("_1");
             } else if (ch == ';') {
diff --git a/plugin/src/sbt-test/sbt-jni/multiclasses/native1/src/library.c b/plugin/src/sbt-test/sbt-jni/multiclasses/native1/src/library.c
index 719d135e..83ee7216 100644
--- a/plugin/src/sbt-test/sbt-jni/multiclasses/native1/src/library.c
+++ b/plugin/src/sbt-test/sbt-jni/multiclasses/native1/src/library.c
@@ -1,6 +1,6 @@
 #include <jni.h>
 #include "multiclasses_Adder.h"
-#include "multiclasses_Adder__.h"
+#include "multiclasses_Adder_00024.h"
 
 /*
  * Class:     multiclasses_Adder
diff --git a/plugin/src/sbt-test/sbt-jni/oneproject/test b/plugin/src/sbt-test/sbt-jni/oneproject/test
index 772ed8e0..556e8ac7 100644
--- a/plugin/src/sbt-test/sbt-jni/oneproject/test
+++ b/plugin/src/sbt-test/sbt-jni/oneproject/test
@@ -1,4 +1,4 @@
 > +javah
-$ exists src/native/include/simple_Library__.h
+$ exists src/native/include/simple_Library_00024.h
 > nativeInit cmake demo
 > +run
diff --git a/plugin/src/sbt-test/sbt-jni/simple-syntax/test b/plugin/src/sbt-test/sbt-jni/simple-syntax/test
index 27c2cb0f..b6780696 100644
--- a/plugin/src/sbt-test/sbt-jni/simple-syntax/test
+++ b/plugin/src/sbt-test/sbt-jni/simple-syntax/test
@@ -1,5 +1,5 @@
 > +javah
-$ exists native/src/include/simple_Library__.h
+$ exists native/src/include/simple_Library_00024.h
 > nativeInit cmake demo
 > +test
 > +core/run
diff --git a/plugin/src/sbt-test/sbt-jni/simple/native/src/library.c b/plugin/src/sbt-test/sbt-jni/simple/native/src/library.c
index 4fa15b1d..15729965 100644
--- a/plugin/src/sbt-test/sbt-jni/simple/native/src/library.c
+++ b/plugin/src/sbt-test/sbt-jni/simple/native/src/library.c
@@ -1,5 +1,5 @@
 #include <stdio.h>
-#include "simple_Library__.h"
+#include "simple_Library_00024.h"
 
 /*
  * Class:     simple_Library__
diff --git a/plugin/src/sbt-test/sbt-jni/simple/test b/plugin/src/sbt-test/sbt-jni/simple/test
index 27c2cb0f..b6780696 100644
--- a/plugin/src/sbt-test/sbt-jni/simple/test
+++ b/plugin/src/sbt-test/sbt-jni/simple/test
@@ -1,5 +1,5 @@
 > +javah
-$ exists native/src/include/simple_Library__.h
+$ exists native/src/include/simple_Library_00024.h
 > nativeInit cmake demo
 > +test
 > +core/run