diff --git a/org.adempiere.report.jasper.swing/META-INF/MANIFEST.MF b/org.adempiere.report.jasper.swing/META-INF/MANIFEST.MF
index 2eebdeaeb9..a3c23f3e9f 100644
--- a/org.adempiere.report.jasper.swing/META-INF/MANIFEST.MF
+++ b/org.adempiere.report.jasper.swing/META-INF/MANIFEST.MF
@@ -9,7 +9,7 @@ Require-Bundle: org.adempiere.base;bundle-version="2.0.0",
 Import-Package: net.sf.jasperreports.engine,
  net.sf.jasperreports.engine.export,
  net.sf.jasperreports.view,
- org.compiere.report.jasper,
+ org.adempiere.report.jasper,
  org.osgi.framework
 Service-Component: OSGI-INF/jrviewerprovider.xml
 Bundle-ActivationPolicy: lazy
diff --git a/org.adempiere.report.jasper.swing/OSGI-INF/jrviewerprovider.xml b/org.adempiere.report.jasper.swing/OSGI-INF/jrviewerprovider.xml
index d7afb17107..1e7305e452 100644
--- a/org.adempiere.report.jasper.swing/OSGI-INF/jrviewerprovider.xml
+++ b/org.adempiere.report.jasper.swing/OSGI-INF/jrviewerprovider.xml
@@ -2,6 +2,6 @@
 <scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.compiere.report.SwingJRViewerProvider">
    <implementation class="org.compiere.report.SwingJRViewerProvider"/>
    <service>
-      <provide interface="org.compiere.report.jasper.JRViewerProvider"/>
+      <provide interface="org.adempiere.report.jasper.JRViewerProvider"/>
    </service>
 </scr:component>
diff --git a/org.adempiere.report.jasper.swing/src/org/compiere/report/SwingJRViewerProvider.java b/org.adempiere.report.jasper.swing/src/org/compiere/report/SwingJRViewerProvider.java
index a725248438..b02603e47e 100644
--- a/org.adempiere.report.jasper.swing/src/org/compiere/report/SwingJRViewerProvider.java
+++ b/org.adempiere.report.jasper.swing/src/org/compiere/report/SwingJRViewerProvider.java
@@ -1,6 +1,6 @@
 package org.compiere.report;
 
-import org.compiere.report.jasper.JRViewerProvider;
+import org.adempiere.report.jasper.JRViewerProvider;
 
 import net.sf.jasperreports.engine.JRException;
 import net.sf.jasperreports.engine.JasperPrint;
diff --git a/org.adempiere.report.jasper/META-INF/MANIFEST.MF b/org.adempiere.report.jasper/META-INF/MANIFEST.MF
index d3f74a8439..eafa69dd5a 100644
--- a/org.adempiere.report.jasper/META-INF/MANIFEST.MF
+++ b/org.adempiere.report.jasper/META-INF/MANIFEST.MF
@@ -12,5 +12,5 @@ Import-Package: org.apache.commons.codec;version="1.3.0",
 Require-Bundle: org.adempiere.base;bundle-version="2.0.0",
  org.adempiere.report.jasper.library;bundle-version="2.0.0"
 Service-Component: OSGI-INF/processfactory.xml
-Export-Package: org.compiere.report.jasper
+Export-Package: org.adempiere.report.jasper
 Bundle-ActivationPolicy: lazy
diff --git a/org.adempiere.report.jasper/OSGI-INF/processfactory.xml b/org.adempiere.report.jasper/OSGI-INF/processfactory.xml
index d11c266e06..4ab516c7e9 100644
--- a/org.adempiere.report.jasper/OSGI-INF/processfactory.xml
+++ b/org.adempiere.report.jasper/OSGI-INF/processfactory.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.compiere.report.jasper.ProcessFactory">
-   <implementation class="org.compiere.report.jasper.ProcessFactory"/>
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.adempiere.report.jasper.ProcessFactory">
+   <implementation class="org.adempiere.report.jasper.ProcessFactory"/>
    <service>
       <provide interface="org.adempiere.base.IProcessFactory"/>
    </service>
diff --git a/org.adempiere.report.jasper/src/org/compiere/report/jasper/JRViewerProvider.java b/org.adempiere.report.jasper/src/org/adempiere/report/jasper/JRViewerProvider.java
similarity index 82%
rename from org.adempiere.report.jasper/src/org/compiere/report/jasper/JRViewerProvider.java
rename to org.adempiere.report.jasper/src/org/adempiere/report/jasper/JRViewerProvider.java
index aaa044d86d..323486b96c 100644
--- a/org.adempiere.report.jasper/src/org/compiere/report/jasper/JRViewerProvider.java
+++ b/org.adempiere.report.jasper/src/org/adempiere/report/jasper/JRViewerProvider.java
@@ -1,4 +1,4 @@
-package org.compiere.report.jasper;
+package org.adempiere.report.jasper;
 
 import net.sf.jasperreports.engine.JRException;
 import net.sf.jasperreports.engine.JasperPrint;
diff --git a/org.adempiere.report.jasper/src/org/compiere/report/jasper/ProcessFactory.java b/org.adempiere.report.jasper/src/org/adempiere/report/jasper/ProcessFactory.java
similarity index 98%
rename from org.adempiere.report.jasper/src/org/compiere/report/jasper/ProcessFactory.java
rename to org.adempiere.report.jasper/src/org/adempiere/report/jasper/ProcessFactory.java
index d415293e5f..d86aea91f7 100644
--- a/org.adempiere.report.jasper/src/org/compiere/report/jasper/ProcessFactory.java
+++ b/org.adempiere.report.jasper/src/org/adempiere/report/jasper/ProcessFactory.java
@@ -11,7 +11,7 @@
  * with this program; if not, write to the Free Software Foundation, Inc.,    *
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.                     *
  *****************************************************************************/
-package org.compiere.report.jasper;
+package org.adempiere.report.jasper;
 
 import org.adempiere.base.IProcessFactory;
 import org.adempiere.util.ProcessUtil;
diff --git a/org.adempiere.report.jasper/src/org/compiere/report/ReportStarter.java b/org.adempiere.report.jasper/src/org/compiere/report/ReportStarter.java
index 27fa7ccff0..cb427282b6 100644
--- a/org.adempiere.report.jasper/src/org/compiere/report/ReportStarter.java
+++ b/org.adempiere.report.jasper/src/org/compiere/report/ReportStarter.java
@@ -79,6 +79,7 @@ import net.sf.jasperreports.engine.xml.JRXmlWriter;
 import org.adempiere.base.Service;
 import org.adempiere.exceptions.AdempiereException;
 import org.adempiere.exceptions.DBException;
+import org.adempiere.report.jasper.JRViewerProvider;
 import org.adempiere.util.IProcessUI;
 import org.compiere.model.MAttachment;
 import org.compiere.model.MAttachmentEntry;
@@ -95,7 +96,6 @@ import org.compiere.process.ClientProcess;
 import org.compiere.process.ProcessCall;
 import org.compiere.process.ProcessInfo;
 import org.compiere.process.ProcessInfoParameter;
-import org.compiere.report.jasper.JRViewerProvider;
 import org.compiere.util.CLogger;
 import org.compiere.util.DB;
 import org.compiere.util.Env;
diff --git a/org.adempiere.ui.zk/META-INF/MANIFEST.MF b/org.adempiere.ui.zk/META-INF/MANIFEST.MF
index 863e959b8f..ade80c5f59 100644
--- a/org.adempiere.ui.zk/META-INF/MANIFEST.MF
+++ b/org.adempiere.ui.zk/META-INF/MANIFEST.MF
@@ -11,13 +11,13 @@ Import-Package: javax.activation;version="1.1.1",
  net.sf.jasperreports.engine,
  net.sf.jasperreports.engine.export,
  net.sf.jasperreports.engine.util,
+ org.adempiere.report.jasper,
  org.apache.commons.codec.binary,
  org.apache.ecs,
  org.apache.ecs.xhtml,
  org.apache.tools.ant,
  org.apache.tools.ant.taskdefs,
  org.compiere.css,
- org.compiere.report.jasper,
  org.osgi.framework;version="1.5.0",
  org.osgi.service.event;version="1.3.0",
  org.osgi.util.tracker;version="1.5.0",
diff --git a/org.adempiere.ui.zk/OSGI-INF/jrviewerprovider.xml b/org.adempiere.ui.zk/OSGI-INF/jrviewerprovider.xml
index e4921119f5..802836a337 100644
--- a/org.adempiere.ui.zk/OSGI-INF/jrviewerprovider.xml
+++ b/org.adempiere.ui.zk/OSGI-INF/jrviewerprovider.xml
@@ -2,6 +2,6 @@
 <scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.adempiere.webui.window.ZkJRViewerProvider">
    <implementation class="org.adempiere.webui.window.ZkJRViewerProvider"/>
    <service>
-      <provide interface="org.compiere.report.jasper.JRViewerProvider"/>
+      <provide interface="org.adempiere.report.jasper.JRViewerProvider"/>
    </service>
 </scr:component>
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/ZkJRViewerProvider.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/ZkJRViewerProvider.java
index 9faaf5f528..42ffaaa0f0 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/ZkJRViewerProvider.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/ZkJRViewerProvider.java
@@ -3,11 +3,11 @@ package org.adempiere.webui.window;
 import net.sf.jasperreports.engine.JRException;
 import net.sf.jasperreports.engine.JasperPrint;
 
+import org.adempiere.report.jasper.JRViewerProvider;
 import org.adempiere.webui.apps.AEnv;
 import org.adempiere.webui.component.Window;
 import org.adempiere.webui.part.WindowContainer;
 import org.adempiere.webui.session.SessionManager;
-import org.compiere.report.jasper.JRViewerProvider;
 
 public class ZkJRViewerProvider implements JRViewerProvider {