diff --git a/java/src/ch/ntb/usb/test/TestGUI.java b/java/src/ch/ntb/usb/testApp/TestGUI.java
similarity index 96%
rename from java/src/ch/ntb/usb/test/TestGUI.java
rename to java/src/ch/ntb/usb/testApp/TestGUI.java
index f7cd17b..8138fa9 100644
--- a/java/src/ch/ntb/usb/test/TestGUI.java
+++ b/java/src/ch/ntb/usb/testApp/TestGUI.java
@@ -1,4 +1,4 @@
-package ch.ntb.usb.test;
+package ch.ntb.usb.testApp;
 
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.Rectangle;
diff --git a/java/src/ch/ntb/usb/test/TestImplementation.java b/java/src/ch/ntb/usb/testApp/TestImplementation.java
similarity index 89%
rename from java/src/ch/ntb/usb/test/TestImplementation.java
rename to java/src/ch/ntb/usb/testApp/TestImplementation.java
index 7f002a8..05ebf56 100644
--- a/java/src/ch/ntb/usb/test/TestImplementation.java
+++ b/java/src/ch/ntb/usb/testApp/TestImplementation.java
@@ -1,4 +1,4 @@
-package ch.ntb.usb.test;
+package ch.ntb.usb.testApp;
 
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -67,7 +67,7 @@ public class TestImplementation {
 	static void write(byte[] data, int length) {
 		int lenWritten = 0;
 		try {
-			lenWritten = dev.bulkwrite(OUT_ENDPOINT, data, length, TIMEOUT,
+			lenWritten = dev.writeBulk(OUT_ENDPOINT, data, length, TIMEOUT,
 					false);
 			StringBuffer sb = new StringBuffer("write_bulkdata: " + lenWritten
 					+ " Bytes sent: ");
@@ -84,7 +84,7 @@ public class TestImplementation {
 		byte[] data = new byte[dev.getMaxPacketSize()];
 		int lenRead = 0;
 		try {
-			lenRead = dev.bulkread(IN_ENDPOINT, data, dev.getMaxPacketSize(),
+			lenRead = dev.readBulk(IN_ENDPOINT, data, dev.getMaxPacketSize(),
 					TIMEOUT, false);
 			StringBuffer sb = new StringBuffer("read_bulkdata: " + lenRead
 					+ " Bytes received: Data: ");
diff --git a/java/src/ch/ntb/usb/test/package.html b/java/src/ch/ntb/usb/testApp/package.html
similarity index 100%
rename from java/src/ch/ntb/usb/test/package.html
rename to java/src/ch/ntb/usb/testApp/package.html