diff --git a/.idea/runConfigurations/All_tests.xml b/.idea/runConfigurations/All_tests.xml
index 71857d973..a90c8b90e 100644
--- a/.idea/runConfigurations/All_tests.xml
+++ b/.idea/runConfigurations/All_tests.xml
@@ -22,8 +22,8 @@
       <option name="RunConfigurationTask" enabled="true" run_configuration_name="All tests in bramble-api" run_configuration_type="AndroidJUnit" />
       <option name="RunConfigurationTask" enabled="true" run_configuration_name="All tests in bramble-core" run_configuration_type="AndroidJUnit" />
       <option name="RunConfigurationTask" enabled="true" run_configuration_name="All tests in bramble-android" run_configuration_type="AndroidJUnit" />
-      <option name="RunConfigurationTask" enabled="true" run_configuration_name="All tests in bramble-j2se" run_configuration_type="AndroidJUnit" />
+      <option name="RunConfigurationTask" enabled="true" run_configuration_name="All tests in bramble-java" run_configuration_type="AndroidJUnit" />
       <option name="RunConfigurationTask" enabled="true" run_configuration_name="All tests in briar-core" run_configuration_type="AndroidJUnit" />
     </method>
   </configuration>
-</component>
\ No newline at end of file
+</component>
diff --git a/.idea/runConfigurations/All_tests_in_bramble_j2se.xml b/.idea/runConfigurations/All_tests_in_bramble_java.xml
similarity index 88%
rename from .idea/runConfigurations/All_tests_in_bramble_j2se.xml
rename to .idea/runConfigurations/All_tests_in_bramble_java.xml
index dce244a17..1da1744cd 100644
--- a/.idea/runConfigurations/All_tests_in_bramble_j2se.xml
+++ b/.idea/runConfigurations/All_tests_in_bramble_java.xml
@@ -1,7 +1,7 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="All tests in bramble-j2se" type="AndroidJUnit" factoryName="Android JUnit">
+  <configuration default="false" name="All tests in bramble-java" type="AndroidJUnit" factoryName="Android JUnit">
     <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-    <module name="bramble-j2se" />
+    <module name="bramble-java" />
     <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
     <option name="ALTERNATIVE_JRE_PATH" />
     <option name="PACKAGE_NAME" value="" />
@@ -10,7 +10,7 @@
     <option name="TEST_OBJECT" value="package" />
     <option name="VM_PARAMETERS" value="-ea -Djava.library.path=libs" />
     <option name="PARAMETERS" value="" />
-    <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/bramble-j2se" />
+    <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/bramble-java" />
     <option name="ENV_VARIABLES" />
     <option name="PASS_PARENT_ENVS" value="true" />
     <option name="TEST_SEARCH_SCOPE">
diff --git a/bramble-core/build.gradle b/bramble-core/build.gradle
index eec6c4387..da57caf0f 100644
--- a/bramble-core/build.gradle
+++ b/bramble-core/build.gradle
@@ -33,7 +33,7 @@ dependencies {
 	signature 'org.codehaus.mojo.signature:java16:1.1@signature'
 }
 
-// needed to make test output available to bramble-j2se
+// needed to make test output available to bramble-java
 configurations {
 	testOutput.extendsFrom(testCompile)
 }
diff --git a/bramble-j2se/.gitignore b/bramble-java/.gitignore
similarity index 100%
rename from bramble-j2se/.gitignore
rename to bramble-java/.gitignore
diff --git a/bramble-j2se/build.gradle b/bramble-java/build.gradle
similarity index 100%
rename from bramble-j2se/build.gradle
rename to bramble-java/build.gradle
diff --git a/bramble-j2se/libs/bluecove-2.1.1-SNAPSHOT-briar.jar b/bramble-java/libs/bluecove-2.1.1-SNAPSHOT-briar.jar
similarity index 100%
rename from bramble-j2se/libs/bluecove-2.1.1-SNAPSHOT-briar.jar
rename to bramble-java/libs/bluecove-2.1.1-SNAPSHOT-briar.jar
diff --git a/bramble-j2se/libs/bluecove-gpl-2.1.1-SNAPSHOT.jar b/bramble-java/libs/bluecove-gpl-2.1.1-SNAPSHOT.jar
similarity index 100%
rename from bramble-j2se/libs/bluecove-gpl-2.1.1-SNAPSHOT.jar
rename to bramble-java/libs/bluecove-gpl-2.1.1-SNAPSHOT.jar
diff --git a/bramble-j2se/libs/jssc-0.9-briar.jar b/bramble-java/libs/jssc-0.9-briar.jar
similarity index 100%
rename from bramble-j2se/libs/jssc-0.9-briar.jar
rename to bramble-java/libs/jssc-0.9-briar.jar
diff --git a/bramble-j2se/libs/source/jssc-0.9-briar-source.jar b/bramble-java/libs/source/jssc-0.9-briar-source.jar
similarity index 100%
rename from bramble-j2se/libs/source/jssc-0.9-briar-source.jar
rename to bramble-java/libs/source/jssc-0.9-briar-source.jar
diff --git a/bramble-j2se/src/main/java/org/briarproject/bramble/lifecycle/DesktopLifecycleModule.java b/bramble-java/src/main/java/org/briarproject/bramble/lifecycle/DesktopLifecycleModule.java
similarity index 100%
rename from bramble-j2se/src/main/java/org/briarproject/bramble/lifecycle/DesktopLifecycleModule.java
rename to bramble-java/src/main/java/org/briarproject/bramble/lifecycle/DesktopLifecycleModule.java
diff --git a/bramble-j2se/src/main/java/org/briarproject/bramble/lifecycle/WindowsShutdownManagerImpl.java b/bramble-java/src/main/java/org/briarproject/bramble/lifecycle/WindowsShutdownManagerImpl.java
similarity index 100%
rename from bramble-j2se/src/main/java/org/briarproject/bramble/lifecycle/WindowsShutdownManagerImpl.java
rename to bramble-java/src/main/java/org/briarproject/bramble/lifecycle/WindowsShutdownManagerImpl.java
diff --git a/bramble-j2se/src/main/java/org/briarproject/bramble/network/JavaNetworkManager.java b/bramble-java/src/main/java/org/briarproject/bramble/network/JavaNetworkManager.java
similarity index 100%
rename from bramble-j2se/src/main/java/org/briarproject/bramble/network/JavaNetworkManager.java
rename to bramble-java/src/main/java/org/briarproject/bramble/network/JavaNetworkManager.java
diff --git a/bramble-j2se/src/main/java/org/briarproject/bramble/network/JavaNetworkModule.java b/bramble-java/src/main/java/org/briarproject/bramble/network/JavaNetworkModule.java
similarity index 100%
rename from bramble-j2se/src/main/java/org/briarproject/bramble/network/JavaNetworkModule.java
rename to bramble-java/src/main/java/org/briarproject/bramble/network/JavaNetworkModule.java
diff --git a/bramble-j2se/src/main/java/org/briarproject/bramble/plugin/DesktopPluginModule.java b/bramble-java/src/main/java/org/briarproject/bramble/plugin/DesktopPluginModule.java
similarity index 100%
rename from bramble-j2se/src/main/java/org/briarproject/bramble/plugin/DesktopPluginModule.java
rename to bramble-java/src/main/java/org/briarproject/bramble/plugin/DesktopPluginModule.java
diff --git a/bramble-j2se/src/main/java/org/briarproject/bramble/plugin/bluetooth/JavaBluetoothPlugin.java b/bramble-java/src/main/java/org/briarproject/bramble/plugin/bluetooth/JavaBluetoothPlugin.java
similarity index 100%
rename from bramble-j2se/src/main/java/org/briarproject/bramble/plugin/bluetooth/JavaBluetoothPlugin.java
rename to bramble-java/src/main/java/org/briarproject/bramble/plugin/bluetooth/JavaBluetoothPlugin.java
diff --git a/bramble-j2se/src/main/java/org/briarproject/bramble/plugin/bluetooth/JavaBluetoothPluginFactory.java b/bramble-java/src/main/java/org/briarproject/bramble/plugin/bluetooth/JavaBluetoothPluginFactory.java
similarity index 100%
rename from bramble-j2se/src/main/java/org/briarproject/bramble/plugin/bluetooth/JavaBluetoothPluginFactory.java
rename to bramble-java/src/main/java/org/briarproject/bramble/plugin/bluetooth/JavaBluetoothPluginFactory.java
diff --git a/bramble-j2se/src/main/java/org/briarproject/bramble/plugin/bluetooth/JavaBluetoothTransportConnection.java b/bramble-java/src/main/java/org/briarproject/bramble/plugin/bluetooth/JavaBluetoothTransportConnection.java
similarity index 100%
rename from bramble-j2se/src/main/java/org/briarproject/bramble/plugin/bluetooth/JavaBluetoothTransportConnection.java
rename to bramble-java/src/main/java/org/briarproject/bramble/plugin/bluetooth/JavaBluetoothTransportConnection.java
diff --git a/bramble-j2se/src/main/java/org/briarproject/bramble/plugin/modem/CountryCodes.java b/bramble-java/src/main/java/org/briarproject/bramble/plugin/modem/CountryCodes.java
similarity index 100%
rename from bramble-j2se/src/main/java/org/briarproject/bramble/plugin/modem/CountryCodes.java
rename to bramble-java/src/main/java/org/briarproject/bramble/plugin/modem/CountryCodes.java
diff --git a/bramble-j2se/src/main/java/org/briarproject/bramble/plugin/modem/Modem.java b/bramble-java/src/main/java/org/briarproject/bramble/plugin/modem/Modem.java
similarity index 100%
rename from bramble-j2se/src/main/java/org/briarproject/bramble/plugin/modem/Modem.java
rename to bramble-java/src/main/java/org/briarproject/bramble/plugin/modem/Modem.java
diff --git a/bramble-j2se/src/main/java/org/briarproject/bramble/plugin/modem/ModemFactory.java b/bramble-java/src/main/java/org/briarproject/bramble/plugin/modem/ModemFactory.java
similarity index 100%
rename from bramble-j2se/src/main/java/org/briarproject/bramble/plugin/modem/ModemFactory.java
rename to bramble-java/src/main/java/org/briarproject/bramble/plugin/modem/ModemFactory.java
diff --git a/bramble-j2se/src/main/java/org/briarproject/bramble/plugin/modem/ModemFactoryImpl.java b/bramble-java/src/main/java/org/briarproject/bramble/plugin/modem/ModemFactoryImpl.java
similarity index 100%
rename from bramble-j2se/src/main/java/org/briarproject/bramble/plugin/modem/ModemFactoryImpl.java
rename to bramble-java/src/main/java/org/briarproject/bramble/plugin/modem/ModemFactoryImpl.java
diff --git a/bramble-j2se/src/main/java/org/briarproject/bramble/plugin/modem/ModemImpl.java b/bramble-java/src/main/java/org/briarproject/bramble/plugin/modem/ModemImpl.java
similarity index 100%
rename from bramble-j2se/src/main/java/org/briarproject/bramble/plugin/modem/ModemImpl.java
rename to bramble-java/src/main/java/org/briarproject/bramble/plugin/modem/ModemImpl.java
diff --git a/bramble-j2se/src/main/java/org/briarproject/bramble/plugin/modem/ModemPlugin.java b/bramble-java/src/main/java/org/briarproject/bramble/plugin/modem/ModemPlugin.java
similarity index 100%
rename from bramble-j2se/src/main/java/org/briarproject/bramble/plugin/modem/ModemPlugin.java
rename to bramble-java/src/main/java/org/briarproject/bramble/plugin/modem/ModemPlugin.java
diff --git a/bramble-j2se/src/main/java/org/briarproject/bramble/plugin/modem/ModemPluginFactory.java b/bramble-java/src/main/java/org/briarproject/bramble/plugin/modem/ModemPluginFactory.java
similarity index 100%
rename from bramble-j2se/src/main/java/org/briarproject/bramble/plugin/modem/ModemPluginFactory.java
rename to bramble-java/src/main/java/org/briarproject/bramble/plugin/modem/ModemPluginFactory.java
diff --git a/bramble-j2se/src/main/java/org/briarproject/bramble/plugin/modem/SerialPort.java b/bramble-java/src/main/java/org/briarproject/bramble/plugin/modem/SerialPort.java
similarity index 100%
rename from bramble-j2se/src/main/java/org/briarproject/bramble/plugin/modem/SerialPort.java
rename to bramble-java/src/main/java/org/briarproject/bramble/plugin/modem/SerialPort.java
diff --git a/bramble-j2se/src/main/java/org/briarproject/bramble/plugin/modem/SerialPortImpl.java b/bramble-java/src/main/java/org/briarproject/bramble/plugin/modem/SerialPortImpl.java
similarity index 100%
rename from bramble-j2se/src/main/java/org/briarproject/bramble/plugin/modem/SerialPortImpl.java
rename to bramble-java/src/main/java/org/briarproject/bramble/plugin/modem/SerialPortImpl.java
diff --git a/bramble-j2se/src/main/java/org/briarproject/bramble/plugin/modem/SerialPortList.java b/bramble-java/src/main/java/org/briarproject/bramble/plugin/modem/SerialPortList.java
similarity index 100%
rename from bramble-j2se/src/main/java/org/briarproject/bramble/plugin/modem/SerialPortList.java
rename to bramble-java/src/main/java/org/briarproject/bramble/plugin/modem/SerialPortList.java
diff --git a/bramble-j2se/src/main/java/org/briarproject/bramble/plugin/modem/SerialPortListImpl.java b/bramble-java/src/main/java/org/briarproject/bramble/plugin/modem/SerialPortListImpl.java
similarity index 100%
rename from bramble-j2se/src/main/java/org/briarproject/bramble/plugin/modem/SerialPortListImpl.java
rename to bramble-java/src/main/java/org/briarproject/bramble/plugin/modem/SerialPortListImpl.java
diff --git a/bramble-j2se/src/main/java/org/briarproject/bramble/plugin/tor/LinuxTorPlugin.java b/bramble-java/src/main/java/org/briarproject/bramble/plugin/tor/LinuxTorPlugin.java
similarity index 100%
rename from bramble-j2se/src/main/java/org/briarproject/bramble/plugin/tor/LinuxTorPlugin.java
rename to bramble-java/src/main/java/org/briarproject/bramble/plugin/tor/LinuxTorPlugin.java
diff --git a/bramble-j2se/src/main/java/org/briarproject/bramble/plugin/tor/LinuxTorPluginFactory.java b/bramble-java/src/main/java/org/briarproject/bramble/plugin/tor/LinuxTorPluginFactory.java
similarity index 100%
rename from bramble-j2se/src/main/java/org/briarproject/bramble/plugin/tor/LinuxTorPluginFactory.java
rename to bramble-java/src/main/java/org/briarproject/bramble/plugin/tor/LinuxTorPluginFactory.java
diff --git a/bramble-j2se/src/main/java/org/briarproject/bramble/system/DesktopSecureRandomModule.java b/bramble-java/src/main/java/org/briarproject/bramble/system/DesktopSecureRandomModule.java
similarity index 100%
rename from bramble-j2se/src/main/java/org/briarproject/bramble/system/DesktopSecureRandomModule.java
rename to bramble-java/src/main/java/org/briarproject/bramble/system/DesktopSecureRandomModule.java
diff --git a/bramble-j2se/src/main/java/org/briarproject/bramble/system/JavaLocationUtils.java b/bramble-java/src/main/java/org/briarproject/bramble/system/JavaLocationUtils.java
similarity index 100%
rename from bramble-j2se/src/main/java/org/briarproject/bramble/system/JavaLocationUtils.java
rename to bramble-java/src/main/java/org/briarproject/bramble/system/JavaLocationUtils.java
diff --git a/bramble-j2se/src/main/java/org/briarproject/bramble/system/JavaResourceProvider.java b/bramble-java/src/main/java/org/briarproject/bramble/system/JavaResourceProvider.java
similarity index 100%
rename from bramble-j2se/src/main/java/org/briarproject/bramble/system/JavaResourceProvider.java
rename to bramble-java/src/main/java/org/briarproject/bramble/system/JavaResourceProvider.java
diff --git a/bramble-j2se/src/main/java/org/briarproject/bramble/system/JavaSystemModule.java b/bramble-java/src/main/java/org/briarproject/bramble/system/JavaSystemModule.java
similarity index 100%
rename from bramble-j2se/src/main/java/org/briarproject/bramble/system/JavaSystemModule.java
rename to bramble-java/src/main/java/org/briarproject/bramble/system/JavaSystemModule.java
diff --git a/bramble-j2se/src/test/java/org/briarproject/bramble/lifecycle/WindowsShutdownManagerImplTest.java b/bramble-java/src/test/java/org/briarproject/bramble/lifecycle/WindowsShutdownManagerImplTest.java
similarity index 100%
rename from bramble-j2se/src/test/java/org/briarproject/bramble/lifecycle/WindowsShutdownManagerImplTest.java
rename to bramble-java/src/test/java/org/briarproject/bramble/lifecycle/WindowsShutdownManagerImplTest.java
diff --git a/bramble-j2se/src/test/java/org/briarproject/bramble/plugin/modem/CountryCodesTest.java b/bramble-java/src/test/java/org/briarproject/bramble/plugin/modem/CountryCodesTest.java
similarity index 100%
rename from bramble-j2se/src/test/java/org/briarproject/bramble/plugin/modem/CountryCodesTest.java
rename to bramble-java/src/test/java/org/briarproject/bramble/plugin/modem/CountryCodesTest.java
diff --git a/bramble-j2se/src/test/java/org/briarproject/bramble/plugin/modem/ModemPluginTest.java b/bramble-java/src/test/java/org/briarproject/bramble/plugin/modem/ModemPluginTest.java
similarity index 100%
rename from bramble-j2se/src/test/java/org/briarproject/bramble/plugin/modem/ModemPluginTest.java
rename to bramble-java/src/test/java/org/briarproject/bramble/plugin/modem/ModemPluginTest.java
diff --git a/bramble-j2se/witness.gradle b/bramble-java/witness.gradle
similarity index 100%
rename from bramble-j2se/witness.gradle
rename to bramble-java/witness.gradle
diff --git a/settings.gradle b/settings.gradle
index 3f3670622..97910eabe 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,7 +1,7 @@
 include ':bramble-api'
 include ':bramble-core'
 include ':bramble-android'
-include ':bramble-j2se'
+include ':bramble-java'
 include ':briar-api'
 include ':briar-core'
 include ':briar-android'
diff --git a/update-dependency-pinning.sh b/update-dependency-pinning.sh
index bbd42ad70..127fa4fb4 100755
--- a/update-dependency-pinning.sh
+++ b/update-dependency-pinning.sh
@@ -5,7 +5,7 @@ PROJECTS=(
     'bramble-api'
     'bramble-core'
     'bramble-android'
-    'bramble-j2se'
+    'bramble-java'
     'briar-api'
     'briar-core'
     'briar-android'