diff --git a/cpp/pipe/Release/pipe.dll b/cpp/pipe/Release/pipe.dll
index eca3cbe..ee7f760 100644
Binary files a/cpp/pipe/Release/pipe.dll and b/cpp/pipe/Release/pipe.dll differ
diff --git a/cpp/pipe/src/pipe.c b/cpp/pipe/src/pipe.c
index c83c76d..bc6221a 100644
--- a/cpp/pipe/src/pipe.c
+++ b/cpp/pipe/src/pipe.c
@@ -5,7 +5,7 @@
 
 #define	DEBUG	0
 
-JNIEXPORT jint JNICALL Java_pipe_Pipes_CreateNamedPipe
+JNIEXPORT jint JNICALL Java_pipe_Pipe_CreateNamedPipe
 (
 	 JNIEnv *env,
 	 jclass className,
@@ -43,7 +43,7 @@ JNIEXPORT jint JNICALL Java_pipe_Pipes_CreateNamedPipe
 	return (jint) pipeHandler;
 }
 
-JNIEXPORT jboolean JNICALL Java_pipe_Pipes_ConnectNamedPipe
+JNIEXPORT jboolean JNICALL Java_pipe_Pipe_ConnectNamedPipe
 (
 	 JNIEnv *env,
 	 jclass className,
@@ -57,7 +57,7 @@ JNIEXPORT jboolean JNICALL Java_pipe_Pipes_ConnectNamedPipe
 	return fConnected;
 }
 
-JNIEXPORT jint JNICALL Java_pipe_Pipes_GetLastError
+JNIEXPORT jint JNICALL Java_pipe_Pipe_GetLastError
 (
 	 JNIEnv *env,
 	 jclass className
@@ -67,7 +67,7 @@ JNIEXPORT jint JNICALL Java_pipe_Pipes_GetLastError
 	return (jint) errorNumber;
 }
 
-JNIEXPORT jboolean JNICALL Java_pipe_Pipes_CloseHandle
+JNIEXPORT jboolean JNICALL Java_pipe_Pipe_CloseHandle
 (
 	 JNIEnv *env,
 	 jclass className,
@@ -80,7 +80,7 @@ JNIEXPORT jboolean JNICALL Java_pipe_Pipes_CloseHandle
 	return result;
 }
 
-JNIEXPORT jbyteArray JNICALL Java_pipe_Pipes_ReadFile
+JNIEXPORT jbyteArray JNICALL Java_pipe_Pipe_ReadFile
 (
 	 JNIEnv *env,
 	 jclass className,
@@ -117,7 +117,7 @@ JNIEXPORT jbyteArray JNICALL Java_pipe_Pipes_ReadFile
 	return lpBuffer;
 }
 
-JNIEXPORT jint JNICALL Java_pipe_Pipes_WriteFile
+JNIEXPORT jint JNICALL Java_pipe_Pipe_WriteFile
 (
 	 JNIEnv *env,
 	 jclass className,
@@ -156,7 +156,7 @@ JNIEXPORT jint JNICALL Java_pipe_Pipes_WriteFile
 	return bytesWritten;
 }
 
-JNIEXPORT jboolean JNICALL Java_pipe_Pipes_FlushFileBuffers
+JNIEXPORT jboolean JNICALL Java_pipe_Pipe_FlushFileBuffers
 (
 	 JNIEnv *env,
 	 jclass className,
@@ -169,7 +169,7 @@ JNIEXPORT jboolean JNICALL Java_pipe_Pipes_FlushFileBuffers
 	return result;
 }
 
-JNIEXPORT jboolean JNICALL Java_pipe_Pipes_DisconnectNamedPipe
+JNIEXPORT jboolean JNICALL Java_pipe_Pipe_DisconnectNamedPipe
 (
 	 JNIEnv *env,
 	 jclass className,
@@ -182,7 +182,7 @@ JNIEXPORT jboolean JNICALL Java_pipe_Pipes_DisconnectNamedPipe
 	return result;
 }
 
-JNIEXPORT jint JNICALL Java_pipe_Pipes_CreateFile
+JNIEXPORT jint JNICALL Java_pipe_Pipe_CreateFile
 (
 	 JNIEnv *env,
 	 jclass className,
@@ -205,7 +205,7 @@ JNIEXPORT jint JNICALL Java_pipe_Pipes_CreateFile
 	return (jint) pipeHandler;
 }
 
-JNIEXPORT jboolean JNICALL Java_pipe_Pipes_WaitNamedPipe
+JNIEXPORT jboolean JNICALL Java_pipe_Pipe_WaitNamedPipe
 (
 	 JNIEnv *env,
 	 jclass className,
@@ -222,7 +222,7 @@ JNIEXPORT jboolean JNICALL Java_pipe_Pipes_WaitNamedPipe
 	return result;
 }
 
-JNIEXPORT jstring JNICALL Java_pipe_Pipes_FormatMessage
+JNIEXPORT jstring JNICALL Java_pipe_Pipe_FormatMessage
 (
 	JNIEnv *env,
 	jclass className,
@@ -250,7 +250,7 @@ JNIEXPORT jstring JNICALL Java_pipe_Pipes_FormatMessage
 	return (jstring) (*env)->NewStringUTF(env, lpDisplayBuf);
 }
 
-JNIEXPORT void JNICALL Java_pipe_Pipes_Print(JNIEnv *env, jclass className, jstring lpMsgBuf)
+JNIEXPORT void JNICALL Java_pipe_Pipe_Print(JNIEnv *env, jclass className, jstring lpMsgBuf)
 {
 	const jbyte *str;
 	str = (*env)->GetStringUTFChars(env, lpMsgBuf, NULL);
diff --git a/cpp/pipe/src/pipe.h b/cpp/pipe/src/pipe.h
index 4687162..af398cb 100644
--- a/cpp/pipe/src/pipe.h
+++ b/cpp/pipe/src/pipe.h
@@ -12,7 +12,7 @@ extern "C" {
  * Method:    CreateNamedPipe
  * Signature: (Ljava/lang/String;IIIIIII)I
  */
-JNIEXPORT jint JNICALL Java_pipe_Pipes_CreateNamedPipe
+JNIEXPORT jint JNICALL Java_pipe_Pipe_CreateNamedPipe
   (JNIEnv *, jclass, jstring, jint, jint, jint, jint, jint, jint, jint);
 
 /*
@@ -20,7 +20,7 @@ JNIEXPORT jint JNICALL Java_pipe_Pipes_CreateNamedPipe
  * Method:    ConnectNamedPipe
  * Signature: (II)Z
  */
-JNIEXPORT jboolean JNICALL Java_pipe_Pipes_ConnectNamedPipe
+JNIEXPORT jboolean JNICALL Java_pipe_Pipe_ConnectNamedPipe
   (JNIEnv *, jclass, jint, jint);
 
 /*
@@ -28,7 +28,7 @@ JNIEXPORT jboolean JNICALL Java_pipe_Pipes_ConnectNamedPipe
  * Method:    GetLastError
  * Signature: ()I
  */
-JNIEXPORT jint JNICALL Java_pipe_Pipes_GetLastError
+JNIEXPORT jint JNICALL Java_pipe_Pipe_GetLastError
   (JNIEnv *, jclass);
 
 /*
@@ -36,7 +36,7 @@ JNIEXPORT jint JNICALL Java_pipe_Pipes_GetLastError
  * Method:    CloseHandle
  * Signature: (I)Z
  */
-JNIEXPORT jboolean JNICALL Java_pipe_Pipes_CloseHandle
+JNIEXPORT jboolean JNICALL Java_pipe_Pipe_CloseHandle
   (JNIEnv *, jclass, jint);
 
 /*
@@ -44,7 +44,7 @@ JNIEXPORT jboolean JNICALL Java_pipe_Pipes_CloseHandle
  * Method:    ReadFile
  * Signature: (II)[B
  */
-JNIEXPORT jbyteArray JNICALL Java_pipe_Pipes_ReadFile
+JNIEXPORT jbyteArray JNICALL Java_pipe_Pipe_ReadFile
   (JNIEnv *, jclass, jint, jint);
 
 /*
@@ -52,7 +52,7 @@ JNIEXPORT jbyteArray JNICALL Java_pipe_Pipes_ReadFile
  * Method:    WriteFile
  * Signature: (I[BI)I
  */
-JNIEXPORT jint JNICALL Java_pipe_Pipes_WriteFile
+JNIEXPORT jint JNICALL Java_pipe_Pipe_WriteFile
   (JNIEnv *, jclass, jint, jbyteArray, jint);
 
 /*
@@ -60,7 +60,7 @@ JNIEXPORT jint JNICALL Java_pipe_Pipes_WriteFile
  * Method:    FlushFileBuffers
  * Signature: (I)Z
  */
-JNIEXPORT jboolean JNICALL Java_pipe_Pipes_FlushFileBuffers
+JNIEXPORT jboolean JNICALL Java_pipe_Pipe_FlushFileBuffers
   (JNIEnv *, jclass, jint);
 
 /*
@@ -68,7 +68,7 @@ JNIEXPORT jboolean JNICALL Java_pipe_Pipes_FlushFileBuffers
  * Method:    DisconnectNamedPipe
  * Signature: (I)Z
  */
-JNIEXPORT jboolean JNICALL Java_pipe_Pipes_DisconnectNamedPipe
+JNIEXPORT jboolean JNICALL Java_pipe_Pipe_DisconnectNamedPipe
   (JNIEnv *, jclass, jint);
 
 /*
@@ -76,7 +76,7 @@ JNIEXPORT jboolean JNICALL Java_pipe_Pipes_DisconnectNamedPipe
  * Method:    CreateFile
  * Signature: (Ljava/lang/String;IIIIII)I
  */
-JNIEXPORT jint JNICALL Java_pipe_Pipes_CreateFile
+JNIEXPORT jint JNICALL Java_pipe_Pipe_CreateFile
   (JNIEnv *, jclass, jstring, jint, jint, jint, jint, jint, jint);
 
 /*
@@ -84,7 +84,7 @@ JNIEXPORT jint JNICALL Java_pipe_Pipes_CreateFile
  * Method:    WaitNamedPipe
  * Signature: (Ljava/lang/String;I)Z
  */
-JNIEXPORT jboolean JNICALL Java_pipe_Pipes_WaitNamedPipe
+JNIEXPORT jboolean JNICALL Java_pipe_Pipe_WaitNamedPipe
   (JNIEnv *, jclass, jstring, jint);
 
 /*
@@ -92,7 +92,7 @@ JNIEXPORT jboolean JNICALL Java_pipe_Pipes_WaitNamedPipe
  * Method:    FormatMessage
  * Signature: (I)Ljava/lang/String;
  */
-JNIEXPORT jstring JNICALL Java_pipe_Pipes_FormatMessage
+JNIEXPORT jstring JNICALL Java_pipe_Pipe_FormatMessage
   (JNIEnv *, jclass, jint);
 
 /*
@@ -100,7 +100,7 @@ JNIEXPORT jstring JNICALL Java_pipe_Pipes_FormatMessage
  * Method:    Print
  * Signature: (Ljava/lang/String;)V
  */
-JNIEXPORT void JNICALL Java_pipe_Pipes_Print
+JNIEXPORT void JNICALL Java_pipe_Pipe_Print
   (JNIEnv *, jclass, jstring);
 
 #ifdef __cplusplus
diff --git a/java/pipe.dll b/java/pipe.dll
index eca3cbe..ee7f760 100644
Binary files a/java/pipe.dll and b/java/pipe.dll differ
diff --git a/java/pipes.dll b/java/pipes.dll
deleted file mode 100644
index be5b824..0000000
Binary files a/java/pipes.dll and /dev/null differ