diff --git a/ejb/remote/vendor/payara-glassfish/src/main/java/org/javaee7/PayaraEJBContextProvider.java b/ejb/remote/vendor/payara-glassfish/src/main/java/org/javaee7/payara/PayaraEJBContextProvider.java
similarity index 95%
rename from ejb/remote/vendor/payara-glassfish/src/main/java/org/javaee7/PayaraEJBContextProvider.java
rename to ejb/remote/vendor/payara-glassfish/src/main/java/org/javaee7/payara/PayaraEJBContextProvider.java
index 0703f5f25..31fc90bb4 100644
--- a/ejb/remote/vendor/payara-glassfish/src/main/java/org/javaee7/PayaraEJBContextProvider.java
+++ b/ejb/remote/vendor/payara-glassfish/src/main/java/org/javaee7/payara/PayaraEJBContextProvider.java
@@ -1,5 +1,5 @@
 /** Copyright Payara Services Limited **/
-package org.javaee7;
+package org.javaee7.payara;
 
 import javax.naming.Context;
 import javax.naming.InitialContext;
@@ -9,6 +9,8 @@
 import com.sun.enterprise.security.auth.login.common.PasswordCredential;
 import com.sun.enterprise.security.common.ClientSecurityContext;
 
+import org.javaee7.RemoteEJBContextProvider;
+
 /**
  * This class returns a JNDI context suitable for remote lookups against the default URL
  * for a remote Payara or GlassFish server (localhost). It sets the provided credentials
diff --git a/ejb/remote/vendor/payara-glassfish/src/main/resources/META-INF/services/org.javaee7.RemoteEJBContextProvider b/ejb/remote/vendor/payara-glassfish/src/main/resources/META-INF/services/org.javaee7.RemoteEJBContextProvider
index 29c9e6aed..44546cb29 100644
--- a/ejb/remote/vendor/payara-glassfish/src/main/resources/META-INF/services/org.javaee7.RemoteEJBContextProvider
+++ b/ejb/remote/vendor/payara-glassfish/src/main/resources/META-INF/services/org.javaee7.RemoteEJBContextProvider
@@ -1 +1 @@
-org.javaee7.PayaraEJBContextProvider
\ No newline at end of file
+org.javaee7.payara.PayaraEJBContextProvider
\ No newline at end of file