diff --git a/extensions/guacamole-auth-vault/.ratignore b/extensions/guacamole-vault/.ratignore
similarity index 100%
rename from extensions/guacamole-auth-vault/.ratignore
rename to extensions/guacamole-vault/.ratignore
diff --git a/extensions/guacamole-auth-vault/modules/guacamole-auth-vault-azure/.ratignore b/extensions/guacamole-vault/modules/guacamole-vault-azure/.ratignore
similarity index 100%
rename from extensions/guacamole-auth-vault/modules/guacamole-auth-vault-azure/.ratignore
rename to extensions/guacamole-vault/modules/guacamole-vault-azure/.ratignore
diff --git a/extensions/guacamole-auth-vault/modules/guacamole-auth-vault-azure/pom.xml b/extensions/guacamole-vault/modules/guacamole-vault-azure/pom.xml
similarity index 97%
rename from extensions/guacamole-auth-vault/modules/guacamole-auth-vault-azure/pom.xml
rename to extensions/guacamole-vault/modules/guacamole-vault-azure/pom.xml
index d1d336aa1..f2448a3d6 100644
--- a/extensions/guacamole-auth-vault/modules/guacamole-auth-vault-azure/pom.xml
+++ b/extensions/guacamole-vault/modules/guacamole-vault-azure/pom.xml
@@ -24,10 +24,10 @@
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.guacamole</groupId>
-    <artifactId>guacamole-auth-vault-azure</artifactId>
+    <artifactId>guacamole-vault-azure</artifactId>
     <packaging>jar</packaging>
     <version>1.4.0</version>
-    <name>guacamole-auth-vault-azure</name>
+    <name>guacamole-vault-azure</name>
     <url>http://guacamole.apache.org/</url>
 
     <properties>
@@ -37,7 +37,7 @@
 
     <parent>
         <groupId>org.apache.guacamole</groupId>
-        <artifactId>guacamole-auth-vault</artifactId>
+        <artifactId>guacamole-vault</artifactId>
         <version>1.4.0</version>
         <relativePath>../../</relativePath>
     </parent>
@@ -70,7 +70,7 @@
         <!-- Guacamole base key vault support -->
         <dependency>
             <groupId>org.apache.guacamole</groupId>
-            <artifactId>guacamole-auth-vault-base</artifactId>
+            <artifactId>guacamole-vault-base</artifactId>
             <version>1.4.0</version>
         </dependency>
 
diff --git a/extensions/guacamole-auth-vault/modules/guacamole-auth-vault-azure/src/main/java/org/apache/guacamole/auth/vault/azure/AzureKeyVaultAuthenticationProvider.java b/extensions/guacamole-vault/modules/guacamole-vault-azure/src/main/java/org/apache/guacamole/vault/azure/AzureKeyVaultAuthenticationProvider.java
similarity index 93%
rename from extensions/guacamole-auth-vault/modules/guacamole-auth-vault-azure/src/main/java/org/apache/guacamole/auth/vault/azure/AzureKeyVaultAuthenticationProvider.java
rename to extensions/guacamole-vault/modules/guacamole-vault-azure/src/main/java/org/apache/guacamole/vault/azure/AzureKeyVaultAuthenticationProvider.java
index 5fd091374..f5f367e09 100644
--- a/extensions/guacamole-auth-vault/modules/guacamole-auth-vault-azure/src/main/java/org/apache/guacamole/auth/vault/azure/AzureKeyVaultAuthenticationProvider.java
+++ b/extensions/guacamole-vault/modules/guacamole-vault-azure/src/main/java/org/apache/guacamole/vault/azure/AzureKeyVaultAuthenticationProvider.java
@@ -17,10 +17,10 @@
  * under the License.
  */
 
-package org.apache.guacamole.auth.vault.azure;
+package org.apache.guacamole.vault.azure;
 
 import org.apache.guacamole.GuacamoleException;
-import org.apache.guacamole.auth.vault.VaultAuthenticationProvider;
+import org.apache.guacamole.vault.VaultAuthenticationProvider;
 
 /**
  * VaultAuthenticationProvider implementation which reads secrets from Azure
diff --git a/extensions/guacamole-auth-vault/modules/guacamole-auth-vault-azure/src/main/java/org/apache/guacamole/auth/vault/azure/AzureKeyVaultAuthenticationProviderModule.java b/extensions/guacamole-vault/modules/guacamole-vault-azure/src/main/java/org/apache/guacamole/vault/azure/AzureKeyVaultAuthenticationProviderModule.java
similarity index 80%
rename from extensions/guacamole-auth-vault/modules/guacamole-auth-vault-azure/src/main/java/org/apache/guacamole/auth/vault/azure/AzureKeyVaultAuthenticationProviderModule.java
rename to extensions/guacamole-vault/modules/guacamole-vault-azure/src/main/java/org/apache/guacamole/vault/azure/AzureKeyVaultAuthenticationProviderModule.java
index ed8474abe..a044743ab 100644
--- a/extensions/guacamole-auth-vault/modules/guacamole-auth-vault-azure/src/main/java/org/apache/guacamole/auth/vault/azure/AzureKeyVaultAuthenticationProviderModule.java
+++ b/extensions/guacamole-vault/modules/guacamole-vault-azure/src/main/java/org/apache/guacamole/vault/azure/AzureKeyVaultAuthenticationProviderModule.java
@@ -17,16 +17,16 @@
  * under the License.
  */
 
-package org.apache.guacamole.auth.vault.azure;
+package org.apache.guacamole.vault.azure;
 
 import com.microsoft.azure.keyvault.authentication.KeyVaultCredentials;
 import org.apache.guacamole.GuacamoleException;
-import org.apache.guacamole.auth.vault.VaultAuthenticationProviderModule;
-import org.apache.guacamole.auth.vault.azure.conf.AzureKeyVaultConfigurationService;
-import org.apache.guacamole.auth.vault.azure.conf.AzureKeyVaultCredentials;
-import org.apache.guacamole.auth.vault.azure.secret.AzureKeyVaultSecretService;
-import org.apache.guacamole.auth.vault.conf.VaultConfigurationService;
-import org.apache.guacamole.auth.vault.secret.VaultSecretService;
+import org.apache.guacamole.vault.VaultAuthenticationProviderModule;
+import org.apache.guacamole.vault.azure.conf.AzureKeyVaultConfigurationService;
+import org.apache.guacamole.vault.azure.conf.AzureKeyVaultCredentials;
+import org.apache.guacamole.vault.azure.secret.AzureKeyVaultSecretService;
+import org.apache.guacamole.vault.conf.VaultConfigurationService;
+import org.apache.guacamole.vault.secret.VaultSecretService;
 
 /**
  * Guice module which configures injections specific to Azure Key Vault
diff --git a/extensions/guacamole-auth-vault/modules/guacamole-auth-vault-azure/src/main/java/org/apache/guacamole/auth/vault/azure/conf/AzureKeyVaultAuthenticationException.java b/extensions/guacamole-vault/modules/guacamole-vault-azure/src/main/java/org/apache/guacamole/vault/azure/conf/AzureKeyVaultAuthenticationException.java
similarity index 97%
rename from extensions/guacamole-auth-vault/modules/guacamole-auth-vault-azure/src/main/java/org/apache/guacamole/auth/vault/azure/conf/AzureKeyVaultAuthenticationException.java
rename to extensions/guacamole-vault/modules/guacamole-vault-azure/src/main/java/org/apache/guacamole/vault/azure/conf/AzureKeyVaultAuthenticationException.java
index 5cf92a1b6..d1eba9be7 100644
--- a/extensions/guacamole-auth-vault/modules/guacamole-auth-vault-azure/src/main/java/org/apache/guacamole/auth/vault/azure/conf/AzureKeyVaultAuthenticationException.java
+++ b/extensions/guacamole-vault/modules/guacamole-vault-azure/src/main/java/org/apache/guacamole/vault/azure/conf/AzureKeyVaultAuthenticationException.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.guacamole.auth.vault.azure.conf;
+package org.apache.guacamole.vault.azure.conf;
 
 /**
  * Unchecked exception thrown by AzureKeyVaultCredentials if an error occurs
diff --git a/extensions/guacamole-auth-vault/modules/guacamole-auth-vault-azure/src/main/java/org/apache/guacamole/auth/vault/azure/conf/AzureKeyVaultConfigurationService.java b/extensions/guacamole-vault/modules/guacamole-vault-azure/src/main/java/org/apache/guacamole/vault/azure/conf/AzureKeyVaultConfigurationService.java
similarity index 97%
rename from extensions/guacamole-auth-vault/modules/guacamole-auth-vault-azure/src/main/java/org/apache/guacamole/auth/vault/azure/conf/AzureKeyVaultConfigurationService.java
rename to extensions/guacamole-vault/modules/guacamole-vault-azure/src/main/java/org/apache/guacamole/vault/azure/conf/AzureKeyVaultConfigurationService.java
index e8e1ceb51..7bfb52919 100644
--- a/extensions/guacamole-auth-vault/modules/guacamole-auth-vault-azure/src/main/java/org/apache/guacamole/auth/vault/azure/conf/AzureKeyVaultConfigurationService.java
+++ b/extensions/guacamole-vault/modules/guacamole-vault-azure/src/main/java/org/apache/guacamole/vault/azure/conf/AzureKeyVaultConfigurationService.java
@@ -17,16 +17,16 @@
  * under the License.
  */
 
-package org.apache.guacamole.auth.vault.azure.conf;
+package org.apache.guacamole.vault.azure.conf;
 
 import com.google.inject.Inject;
 import com.google.inject.Singleton;
 import com.microsoft.aad.adal4j.ClientCredential;
 import org.apache.guacamole.GuacamoleException;
-import org.apache.guacamole.auth.vault.conf.VaultConfigurationService;
 import org.apache.guacamole.environment.Environment;
 import org.apache.guacamole.properties.IntegerGuacamoleProperty;
 import org.apache.guacamole.properties.StringGuacamoleProperty;
+import org.apache.guacamole.vault.conf.VaultConfigurationService;
 
 /**
  * Service for retrieving configuration information regarding the Azure Key
diff --git a/extensions/guacamole-auth-vault/modules/guacamole-auth-vault-azure/src/main/java/org/apache/guacamole/auth/vault/azure/conf/AzureKeyVaultCredentials.java b/extensions/guacamole-vault/modules/guacamole-vault-azure/src/main/java/org/apache/guacamole/vault/azure/conf/AzureKeyVaultCredentials.java
similarity index 98%
rename from extensions/guacamole-auth-vault/modules/guacamole-auth-vault-azure/src/main/java/org/apache/guacamole/auth/vault/azure/conf/AzureKeyVaultCredentials.java
rename to extensions/guacamole-vault/modules/guacamole-vault-azure/src/main/java/org/apache/guacamole/vault/azure/conf/AzureKeyVaultCredentials.java
index c69da5f1e..36bde5d53 100644
--- a/extensions/guacamole-auth-vault/modules/guacamole-auth-vault-azure/src/main/java/org/apache/guacamole/auth/vault/azure/conf/AzureKeyVaultCredentials.java
+++ b/extensions/guacamole-vault/modules/guacamole-vault-azure/src/main/java/org/apache/guacamole/vault/azure/conf/AzureKeyVaultCredentials.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.guacamole.auth.vault.azure.conf;
+package org.apache.guacamole.vault.azure.conf;
 
 import com.google.inject.Inject;
 import com.microsoft.aad.adal4j.AuthenticationContext;
diff --git a/extensions/guacamole-auth-vault/modules/guacamole-auth-vault-azure/src/main/java/org/apache/guacamole/auth/vault/azure/secret/AzureKeyVaultSecretService.java b/extensions/guacamole-vault/modules/guacamole-vault-azure/src/main/java/org/apache/guacamole/vault/azure/secret/AzureKeyVaultSecretService.java
similarity index 92%
rename from extensions/guacamole-auth-vault/modules/guacamole-auth-vault-azure/src/main/java/org/apache/guacamole/auth/vault/azure/secret/AzureKeyVaultSecretService.java
rename to extensions/guacamole-vault/modules/guacamole-vault-azure/src/main/java/org/apache/guacamole/vault/azure/secret/AzureKeyVaultSecretService.java
index 65d75dc9b..cd5ed3537 100644
--- a/extensions/guacamole-auth-vault/modules/guacamole-auth-vault-azure/src/main/java/org/apache/guacamole/auth/vault/azure/secret/AzureKeyVaultSecretService.java
+++ b/extensions/guacamole-vault/modules/guacamole-vault-azure/src/main/java/org/apache/guacamole/vault/azure/secret/AzureKeyVaultSecretService.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.guacamole.auth.vault.azure.secret;
+package org.apache.guacamole.vault.azure.secret;
 
 import com.google.inject.Inject;
 import com.google.inject.Provider;
@@ -30,9 +30,9 @@ import java.util.concurrent.CompletableFuture;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import org.apache.guacamole.GuacamoleException;
-import org.apache.guacamole.auth.vault.azure.conf.AzureKeyVaultAuthenticationException;
-import org.apache.guacamole.auth.vault.azure.conf.AzureKeyVaultConfigurationService;
-import org.apache.guacamole.auth.vault.secret.CachedVaultSecretService;
+import org.apache.guacamole.vault.azure.conf.AzureKeyVaultAuthenticationException;
+import org.apache.guacamole.vault.azure.conf.AzureKeyVaultConfigurationService;
+import org.apache.guacamole.vault.secret.CachedVaultSecretService;
 
 /**
  * Service which retrieves secrets from Azure Key Vault.
diff --git a/extensions/guacamole-auth-vault/modules/guacamole-auth-vault-azure/src/main/resources/guac-manifest.json b/extensions/guacamole-vault/modules/guacamole-vault-azure/src/main/resources/guac-manifest.json
similarity index 71%
rename from extensions/guacamole-auth-vault/modules/guacamole-auth-vault-azure/src/main/resources/guac-manifest.json
rename to extensions/guacamole-vault/modules/guacamole-vault-azure/src/main/resources/guac-manifest.json
index 87e1b1165..9f6ee94a4 100644
--- a/extensions/guacamole-auth-vault/modules/guacamole-auth-vault-azure/src/main/resources/guac-manifest.json
+++ b/extensions/guacamole-vault/modules/guacamole-vault-azure/src/main/resources/guac-manifest.json
@@ -6,7 +6,7 @@
     "namespace" : "azure-keyvault",
 
     "authProviders" : [
-        "org.apache.guacamole.auth.vault.azure.AzureKeyVaultAuthenticationProvider"
+        "org.apache.guacamole.vault.azure.AzureKeyVaultAuthenticationProvider"
     ],
 
     "translations" : [
diff --git a/extensions/guacamole-auth-vault/modules/guacamole-auth-vault-base/.ratignore b/extensions/guacamole-vault/modules/guacamole-vault-base/.ratignore
similarity index 100%
rename from extensions/guacamole-auth-vault/modules/guacamole-auth-vault-base/.ratignore
rename to extensions/guacamole-vault/modules/guacamole-vault-base/.ratignore
diff --git a/extensions/guacamole-auth-vault/modules/guacamole-auth-vault-base/pom.xml b/extensions/guacamole-vault/modules/guacamole-vault-base/pom.xml
similarity index 93%
rename from extensions/guacamole-auth-vault/modules/guacamole-auth-vault-base/pom.xml
rename to extensions/guacamole-vault/modules/guacamole-vault-base/pom.xml
index d59754fe6..87c6c9404 100644
--- a/extensions/guacamole-auth-vault/modules/guacamole-auth-vault-base/pom.xml
+++ b/extensions/guacamole-vault/modules/guacamole-vault-base/pom.xml
@@ -24,9 +24,9 @@
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.guacamole</groupId>
-    <artifactId>guacamole-auth-vault-base</artifactId>
+    <artifactId>guacamole-vault-base</artifactId>
     <packaging>jar</packaging>
-    <name>guacamole-auth-vault-base</name>
+    <name>guacamole-vault-base</name>
     <url>http://guacamole.apache.org/</url>
 
     <properties>
@@ -35,7 +35,7 @@
 
     <parent>
         <groupId>org.apache.guacamole</groupId>
-        <artifactId>guacamole-auth-vault</artifactId>
+        <artifactId>guacamole-vault</artifactId>
         <version>1.4.0</version>
         <relativePath>../../</relativePath>
     </parent>
diff --git a/extensions/guacamole-auth-vault/modules/guacamole-auth-vault-base/src/main/java/org/apache/guacamole/auth/vault/VaultAuthenticationProvider.java b/extensions/guacamole-vault/modules/guacamole-vault-base/src/main/java/org/apache/guacamole/vault/VaultAuthenticationProvider.java
similarity index 95%
rename from extensions/guacamole-auth-vault/modules/guacamole-auth-vault-base/src/main/java/org/apache/guacamole/auth/vault/VaultAuthenticationProvider.java
rename to extensions/guacamole-vault/modules/guacamole-vault-base/src/main/java/org/apache/guacamole/vault/VaultAuthenticationProvider.java
index 0b9126a67..a18b9c05a 100644
--- a/extensions/guacamole-auth-vault/modules/guacamole-auth-vault-base/src/main/java/org/apache/guacamole/auth/vault/VaultAuthenticationProvider.java
+++ b/extensions/guacamole-vault/modules/guacamole-vault-base/src/main/java/org/apache/guacamole/vault/VaultAuthenticationProvider.java
@@ -17,16 +17,16 @@
  * under the License.
  */
 
-package org.apache.guacamole.auth.vault;
+package org.apache.guacamole.vault;
 
 import com.google.inject.Guice;
 import com.google.inject.Injector;
 import org.apache.guacamole.GuacamoleException;
-import org.apache.guacamole.auth.vault.user.VaultUserContextFactory;
 import org.apache.guacamole.net.auth.AbstractAuthenticationProvider;
 import org.apache.guacamole.net.auth.AuthenticatedUser;
 import org.apache.guacamole.net.auth.Credentials;
 import org.apache.guacamole.net.auth.UserContext;
+import org.apache.guacamole.vault.user.VaultUserContextFactory;
 
 /**
  * AuthenticationProvider implementation which automatically injects tokens
diff --git a/extensions/guacamole-auth-vault/modules/guacamole-auth-vault-base/src/main/java/org/apache/guacamole/auth/vault/VaultAuthenticationProviderModule.java b/extensions/guacamole-vault/modules/guacamole-vault-base/src/main/java/org/apache/guacamole/vault/VaultAuthenticationProviderModule.java
similarity index 95%
rename from extensions/guacamole-auth-vault/modules/guacamole-auth-vault-base/src/main/java/org/apache/guacamole/auth/vault/VaultAuthenticationProviderModule.java
rename to extensions/guacamole-vault/modules/guacamole-vault-base/src/main/java/org/apache/guacamole/vault/VaultAuthenticationProviderModule.java
index 9e5ae7155..94119a7a2 100644
--- a/extensions/guacamole-auth-vault/modules/guacamole-auth-vault-base/src/main/java/org/apache/guacamole/auth/vault/VaultAuthenticationProviderModule.java
+++ b/extensions/guacamole-vault/modules/guacamole-vault-base/src/main/java/org/apache/guacamole/vault/VaultAuthenticationProviderModule.java
@@ -17,16 +17,16 @@
  * under the License.
  */
 
-package org.apache.guacamole.auth.vault;
+package org.apache.guacamole.vault;
 
 import com.google.inject.AbstractModule;
 import com.google.inject.assistedinject.FactoryModuleBuilder;
 import org.apache.guacamole.GuacamoleException;
-import org.apache.guacamole.auth.vault.user.VaultUserContext;
-import org.apache.guacamole.auth.vault.user.VaultUserContextFactory;
 import org.apache.guacamole.environment.Environment;
 import org.apache.guacamole.environment.LocalEnvironment;
 import org.apache.guacamole.net.auth.UserContext;
+import org.apache.guacamole.vault.user.VaultUserContext;
+import org.apache.guacamole.vault.user.VaultUserContextFactory;
 
 /**
  * Guice module which configures injections specific to the base support for
diff --git a/extensions/guacamole-auth-vault/modules/guacamole-auth-vault-base/src/main/java/org/apache/guacamole/auth/vault/conf/VaultConfigurationService.java b/extensions/guacamole-vault/modules/guacamole-vault-base/src/main/java/org/apache/guacamole/vault/conf/VaultConfigurationService.java
similarity index 96%
rename from extensions/guacamole-auth-vault/modules/guacamole-auth-vault-base/src/main/java/org/apache/guacamole/auth/vault/conf/VaultConfigurationService.java
rename to extensions/guacamole-vault/modules/guacamole-vault-base/src/main/java/org/apache/guacamole/vault/conf/VaultConfigurationService.java
index 9cafbd45f..9c01f7030 100644
--- a/extensions/guacamole-auth-vault/modules/guacamole-auth-vault-base/src/main/java/org/apache/guacamole/auth/vault/conf/VaultConfigurationService.java
+++ b/extensions/guacamole-vault/modules/guacamole-vault-base/src/main/java/org/apache/guacamole/vault/conf/VaultConfigurationService.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.guacamole.auth.vault.conf;
+package org.apache.guacamole.vault.conf;
 
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -27,8 +27,8 @@ import java.io.IOException;
 import java.util.Map;
 import org.apache.guacamole.GuacamoleException;
 import org.apache.guacamole.GuacamoleServerException;
-import org.apache.guacamole.auth.vault.VaultAuthenticationProviderModule;
 import org.apache.guacamole.environment.Environment;
+import org.apache.guacamole.vault.VaultAuthenticationProviderModule;
 
 /**
  * Base class for services which retrieve key vault configuration information.
diff --git a/extensions/guacamole-auth-vault/modules/guacamole-auth-vault-base/src/main/java/org/apache/guacamole/auth/vault/secret/CachedVaultSecretService.java b/extensions/guacamole-vault/modules/guacamole-vault-base/src/main/java/org/apache/guacamole/vault/secret/CachedVaultSecretService.java
similarity index 99%
rename from extensions/guacamole-auth-vault/modules/guacamole-auth-vault-base/src/main/java/org/apache/guacamole/auth/vault/secret/CachedVaultSecretService.java
rename to extensions/guacamole-vault/modules/guacamole-vault-base/src/main/java/org/apache/guacamole/vault/secret/CachedVaultSecretService.java
index e3f26bdd3..b26fdba94 100644
--- a/extensions/guacamole-auth-vault/modules/guacamole-auth-vault-base/src/main/java/org/apache/guacamole/auth/vault/secret/CachedVaultSecretService.java
+++ b/extensions/guacamole-vault/modules/guacamole-vault-base/src/main/java/org/apache/guacamole/vault/secret/CachedVaultSecretService.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.guacamole.auth.vault.secret;
+package org.apache.guacamole.vault.secret;
 
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ConcurrentHashMap;
diff --git a/extensions/guacamole-auth-vault/modules/guacamole-auth-vault-base/src/main/java/org/apache/guacamole/auth/vault/secret/VaultSecretService.java b/extensions/guacamole-vault/modules/guacamole-vault-base/src/main/java/org/apache/guacamole/vault/secret/VaultSecretService.java
similarity index 98%
rename from extensions/guacamole-auth-vault/modules/guacamole-auth-vault-base/src/main/java/org/apache/guacamole/auth/vault/secret/VaultSecretService.java
rename to extensions/guacamole-vault/modules/guacamole-vault-base/src/main/java/org/apache/guacamole/vault/secret/VaultSecretService.java
index a78826eb5..04f3783df 100644
--- a/extensions/guacamole-auth-vault/modules/guacamole-auth-vault-base/src/main/java/org/apache/guacamole/auth/vault/secret/VaultSecretService.java
+++ b/extensions/guacamole-vault/modules/guacamole-vault-base/src/main/java/org/apache/guacamole/vault/secret/VaultSecretService.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.guacamole.auth.vault.secret;
+package org.apache.guacamole.vault.secret;
 
 import java.util.concurrent.Future;
 import org.apache.guacamole.GuacamoleException;
diff --git a/extensions/guacamole-auth-vault/modules/guacamole-auth-vault-base/src/main/java/org/apache/guacamole/auth/vault/user/VaultUserContext.java b/extensions/guacamole-vault/modules/guacamole-vault-base/src/main/java/org/apache/guacamole/vault/user/VaultUserContext.java
similarity index 98%
rename from extensions/guacamole-auth-vault/modules/guacamole-auth-vault-base/src/main/java/org/apache/guacamole/auth/vault/user/VaultUserContext.java
rename to extensions/guacamole-vault/modules/guacamole-vault-base/src/main/java/org/apache/guacamole/vault/user/VaultUserContext.java
index 0a03b78a0..1adf5c54d 100644
--- a/extensions/guacamole-auth-vault/modules/guacamole-auth-vault-base/src/main/java/org/apache/guacamole/auth/vault/user/VaultUserContext.java
+++ b/extensions/guacamole-vault/modules/guacamole-vault-base/src/main/java/org/apache/guacamole/vault/user/VaultUserContext.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.guacamole.auth.vault.user;
+package org.apache.guacamole.vault.user;
 
 import com.google.inject.Inject;
 import com.google.inject.assistedinject.Assisted;
@@ -28,15 +28,15 @@ import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
 import org.apache.guacamole.GuacamoleException;
 import org.apache.guacamole.GuacamoleServerException;
-import org.apache.guacamole.auth.vault.conf.VaultConfigurationService;
 import org.apache.guacamole.net.auth.Connection;
 import org.apache.guacamole.net.auth.ConnectionGroup;
 import org.apache.guacamole.net.auth.TokenInjectingUserContext;
 import org.apache.guacamole.net.auth.UserContext;
-import org.apache.guacamole.auth.vault.secret.VaultSecretService;
 import org.apache.guacamole.protocol.GuacamoleConfiguration;
 import org.apache.guacamole.token.GuacamoleTokenUndefinedException;
 import org.apache.guacamole.token.TokenFilter;
+import org.apache.guacamole.vault.conf.VaultConfigurationService;
+import org.apache.guacamole.vault.secret.VaultSecretService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/extensions/guacamole-auth-vault/modules/guacamole-auth-vault-base/src/main/java/org/apache/guacamole/auth/vault/user/VaultUserContextFactory.java b/extensions/guacamole-vault/modules/guacamole-vault-base/src/main/java/org/apache/guacamole/vault/user/VaultUserContextFactory.java
similarity index 97%
rename from extensions/guacamole-auth-vault/modules/guacamole-auth-vault-base/src/main/java/org/apache/guacamole/auth/vault/user/VaultUserContextFactory.java
rename to extensions/guacamole-vault/modules/guacamole-vault-base/src/main/java/org/apache/guacamole/vault/user/VaultUserContextFactory.java
index 712d41a9b..03e6c3a9b 100644
--- a/extensions/guacamole-auth-vault/modules/guacamole-auth-vault-base/src/main/java/org/apache/guacamole/auth/vault/user/VaultUserContextFactory.java
+++ b/extensions/guacamole-vault/modules/guacamole-vault-base/src/main/java/org/apache/guacamole/vault/user/VaultUserContextFactory.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.guacamole.auth.vault.user;
+package org.apache.guacamole.vault.user;
 
 import org.apache.guacamole.net.auth.UserContext;
 
diff --git a/extensions/guacamole-auth-vault/modules/guacamole-auth-vault-base/src/main/resources/translations/en.json b/extensions/guacamole-vault/modules/guacamole-vault-base/src/main/resources/translations/en.json
similarity index 100%
rename from extensions/guacamole-auth-vault/modules/guacamole-auth-vault-base/src/main/resources/translations/en.json
rename to extensions/guacamole-vault/modules/guacamole-vault-base/src/main/resources/translations/en.json
diff --git a/extensions/guacamole-auth-vault/modules/guacamole-auth-vault-dist/.ratignore b/extensions/guacamole-vault/modules/guacamole-vault-dist/.ratignore
similarity index 100%
rename from extensions/guacamole-auth-vault/modules/guacamole-auth-vault-dist/.ratignore
rename to extensions/guacamole-vault/modules/guacamole-vault-dist/.ratignore
diff --git a/extensions/guacamole-auth-vault/modules/guacamole-auth-vault-dist/pom.xml b/extensions/guacamole-vault/modules/guacamole-vault-dist/pom.xml
similarity index 82%
rename from extensions/guacamole-auth-vault/modules/guacamole-auth-vault-dist/pom.xml
rename to extensions/guacamole-vault/modules/guacamole-vault-dist/pom.xml
index b239f28bf..abbba239c 100644
--- a/extensions/guacamole-auth-vault/modules/guacamole-auth-vault-dist/pom.xml
+++ b/extensions/guacamole-vault/modules/guacamole-vault-dist/pom.xml
@@ -24,9 +24,9 @@
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.guacamole</groupId>
-    <artifactId>guacamole-auth-vault-dist</artifactId>
+    <artifactId>guacamole-vault-dist</artifactId>
     <packaging>pom</packaging>
-    <name>guacamole-auth-vault-dist</name>
+    <name>guacamole-vault-dist</name>
     <url>http://guacamole.apache.org/</url>
 
     <properties>
@@ -35,7 +35,7 @@
 
     <parent>
         <groupId>org.apache.guacamole</groupId>
-        <artifactId>guacamole-auth-vault</artifactId>
+        <artifactId>guacamole-vault</artifactId>
         <version>1.4.0</version>
         <relativePath>../../</relativePath>
     </parent>
@@ -45,7 +45,7 @@
         <!-- Azure Key Vault Extension -->
         <dependency>
             <groupId>org.apache.guacamole</groupId>
-            <artifactId>guacamole-auth-vault-azure</artifactId>
+            <artifactId>guacamole-vault-azure</artifactId>
             <version>1.4.0</version>
         </dependency>
 
@@ -53,9 +53,8 @@
 
     <build>
 
-        <!-- Dist .tar.gz for guacamole-auth-vault should be named after the
-            parent guacamole-auth-vault project, not after
-            guacamole-auth-vault-dist -->
+        <!-- Dist .tar.gz for guacamole-vault should be named after the parent
+            guacamole-vault project, not after guacamole-vault-dist -->
         <finalName>${project.parent.artifactId}-${project.parent.version}</finalName>
 
     </build>
diff --git a/extensions/guacamole-auth-vault/modules/guacamole-auth-vault-dist/src/main/assembly/dist.xml b/extensions/guacamole-vault/modules/guacamole-vault-dist/src/main/assembly/dist.xml
similarity index 95%
rename from extensions/guacamole-auth-vault/modules/guacamole-auth-vault-dist/src/main/assembly/dist.xml
rename to extensions/guacamole-vault/modules/guacamole-vault-dist/src/main/assembly/dist.xml
index b0ea3b1f6..8d5c4b866 100644
--- a/extensions/guacamole-auth-vault/modules/guacamole-auth-vault-dist/src/main/assembly/dist.xml
+++ b/extensions/guacamole-vault/modules/guacamole-vault-dist/src/main/assembly/dist.xml
@@ -37,7 +37,7 @@
         <dependencySet>
             <outputDirectory>azure</outputDirectory>
             <includes>
-                <include>org.apache.guacamole:guacamole-auth-vault-azure</include>
+                <include>org.apache.guacamole:guacamole-vault-azure</include>
             </includes>
         </dependencySet>
 
diff --git a/extensions/guacamole-auth-vault/pom.xml b/extensions/guacamole-vault/pom.xml
similarity index 88%
rename from extensions/guacamole-auth-vault/pom.xml
rename to extensions/guacamole-vault/pom.xml
index a924af8b3..281572b3a 100644
--- a/extensions/guacamole-auth-vault/pom.xml
+++ b/extensions/guacamole-vault/pom.xml
@@ -24,10 +24,10 @@
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.guacamole</groupId>
-    <artifactId>guacamole-auth-vault</artifactId>
+    <artifactId>guacamole-vault</artifactId>
     <packaging>pom</packaging>
     <version>1.4.0</version>
-    <name>guacamole-auth-vault</name>
+    <name>guacamole-vault</name>
     <url>http://guacamole.apache.org/</url>
 
     <parent>
@@ -40,13 +40,13 @@
     <modules>
 
         <!-- Distribution .tar.gz -->
-        <module>modules/guacamole-auth-vault-dist</module>
+        <module>modules/guacamole-vault-dist</module>
 
         <!-- Base key vault classes -->
-        <module>modules/guacamole-auth-vault-base</module>
+        <module>modules/guacamole-vault-base</module>
 
         <!-- Provider-specific implementations -->
-        <module>modules/guacamole-auth-vault-azure</module>
+        <module>modules/guacamole-vault-azure</module>
 
     </modules>
 
diff --git a/extensions/pom.xml b/extensions/pom.xml
index 18e307e54..d400b08ff 100644
--- a/extensions/pom.xml
+++ b/extensions/pom.xml
@@ -48,7 +48,9 @@
         <module>guacamole-auth-quickconnect</module>
         <module>guacamole-auth-sso</module>
         <module>guacamole-auth-totp</module>
-        <module>guacamole-auth-vault</module>
+
+        <!-- Additional features -->
+        <module>guacamole-vault</module>
 
     </modules>