Index: src/main/java/org/apache/pdfbox/encoding/conversion/EncodingConverter.java
===================================================================
--- src/main/java/org/apache/pdfbox/encoding/conversion/EncodingConverter.java	(revision 763152)
+++ src/main/java/org/apache/pdfbox/encoding/conversion/EncodingConverter.java	(working copy)
@@ -16,7 +16,7 @@
  */
 package org.apache.pdfbox.encoding.conversion;
 
-import org.fontbox.cmap.CMap;
+import org.apache.fontbox.cmap.CMap;
 
 /**
  *  EncodingConverter converts string or characters in one encoding, which is specified in PDF
Index: src/main/java/org/apache/pdfbox/encoding/conversion/CJKConverter.java
===================================================================
--- src/main/java/org/apache/pdfbox/encoding/conversion/CJKConverter.java	(revision 763152)
+++ src/main/java/org/apache/pdfbox/encoding/conversion/CJKConverter.java	(working copy)
@@ -17,7 +17,7 @@
 
 package org.apache.pdfbox.encoding.conversion;
 
-import org.fontbox.cmap.CMap;
+import org.apache.fontbox.cmap.CMap;
 import java.io.UnsupportedEncodingException;
 
 
Index: src/main/java/org/apache/pdfbox/encoding/AFMEncoding.java
===================================================================
--- src/main/java/org/apache/pdfbox/encoding/AFMEncoding.java	(revision 763152)
+++ src/main/java/org/apache/pdfbox/encoding/AFMEncoding.java	(working copy)
@@ -18,8 +18,8 @@
 
 import java.util.Iterator;
 
-import org.fontbox.afm.CharMetric;
-import org.fontbox.afm.FontMetric;
+import org.apache.fontbox.afm.CharMetric;
+import org.apache.fontbox.afm.FontMetric;
 
 import org.apache.pdfbox.cos.COSBase;
 import org.apache.pdfbox.cos.COSName;
Index: src/main/java/org/apache/pdfbox/pdmodel/font/PDSimpleFont.java
===================================================================
--- src/main/java/org/apache/pdfbox/pdmodel/font/PDSimpleFont.java	(revision 763152)
+++ src/main/java/org/apache/pdfbox/pdmodel/font/PDSimpleFont.java	(working copy)
@@ -23,7 +23,7 @@
 
 import java.util.HashMap;
 
-import org.fontbox.afm.FontMetric;
+import org.apache.fontbox.afm.FontMetric;
 
 import org.apache.pdfbox.cos.COSArray;
 import org.apache.pdfbox.cos.COSDictionary;
Index: src/main/java/org/apache/pdfbox/pdmodel/font/PDFontDescriptorAFM.java
===================================================================
--- src/main/java/org/apache/pdfbox/pdmodel/font/PDFontDescriptorAFM.java	(revision 763152)
+++ src/main/java/org/apache/pdfbox/pdmodel/font/PDFontDescriptorAFM.java	(working copy)
@@ -18,11 +18,11 @@
 
 import java.io.IOException;
 
-import org.fontbox.afm.FontMetric;
+import org.apache.fontbox.afm.FontMetric;
 
 import org.apache.pdfbox.pdmodel.common.PDRectangle;
 
-import org.fontbox.util.BoundingBox;
+import org.apache.fontbox.util.BoundingBox;
 
 /**
  * This class represents the font descriptor when the font information
Index: src/main/java/org/apache/pdfbox/pdmodel/font/PDType1AfmPfbFont.java
===================================================================
--- src/main/java/org/apache/pdfbox/pdmodel/font/PDType1AfmPfbFont.java	(revision 763152)
+++ src/main/java/org/apache/pdfbox/pdmodel/font/PDType1AfmPfbFont.java	(working copy)
@@ -25,11 +25,11 @@
 import java.util.Iterator;
 import java.util.List;
 
-import org.fontbox.afm.AFMParser;
-import org.fontbox.afm.CharMetric;
-import org.fontbox.afm.FontMetric;
+import org.apache.fontbox.afm.AFMParser;
+import org.apache.fontbox.afm.CharMetric;
+import org.apache.fontbox.afm.FontMetric;
 
-import org.fontbox.pfb.PfbParser;
+import org.apache.fontbox.pfb.PfbParser;
 
 import org.apache.pdfbox.encoding.*;
 import org.apache.pdfbox.pdmodel.PDDocument;
Index: src/main/java/org/apache/pdfbox/pdmodel/font/PDTrueTypeFont.java
===================================================================
--- src/main/java/org/apache/pdfbox/pdmodel/font/PDTrueTypeFont.java	(revision 763152)
+++ src/main/java/org/apache/pdfbox/pdmodel/font/PDTrueTypeFont.java	(working copy)
@@ -16,19 +16,19 @@
  */
 package org.apache.pdfbox.pdmodel.font;
 
-import org.fontbox.ttf.CMAPEncodingEntry;
-import org.fontbox.ttf.CMAPTable;
-import org.fontbox.ttf.GlyphData;
-import org.fontbox.ttf.GlyphTable;
-import org.fontbox.ttf.HeaderTable;
-import org.fontbox.ttf.HorizontalHeaderTable;
-import org.fontbox.ttf.HorizontalMetricsTable;
-import org.fontbox.ttf.NamingTable;
-import org.fontbox.ttf.NameRecord;
-import org.fontbox.ttf.OS2WindowsMetricsTable;
-import org.fontbox.ttf.PostScriptTable;
-import org.fontbox.ttf.TTFParser;
-import org.fontbox.ttf.TrueTypeFont;
+import org.apache.fontbox.ttf.CMAPEncodingEntry;
+import org.apache.fontbox.ttf.CMAPTable;
+import org.apache.fontbox.ttf.GlyphData;
+import org.apache.fontbox.ttf.GlyphTable;
+import org.apache.fontbox.ttf.HeaderTable;
+import org.apache.fontbox.ttf.HorizontalHeaderTable;
+import org.apache.fontbox.ttf.HorizontalMetricsTable;
+import org.apache.fontbox.ttf.NamingTable;
+import org.apache.fontbox.ttf.NameRecord;
+import org.apache.fontbox.ttf.OS2WindowsMetricsTable;
+import org.apache.fontbox.ttf.PostScriptTable;
+import org.apache.fontbox.ttf.TTFParser;
+import org.apache.fontbox.ttf.TrueTypeFont;
 
 import org.apache.pdfbox.cos.COSDictionary;
 import org.apache.pdfbox.cos.COSName;
Index: src/main/java/org/apache/pdfbox/pdmodel/font/Type3StreamParser.java
===================================================================
--- src/main/java/org/apache/pdfbox/pdmodel/font/Type3StreamParser.java	(revision 763152)
+++ src/main/java/org/apache/pdfbox/pdmodel/font/Type3StreamParser.java	(working copy)
@@ -22,7 +22,7 @@
 
 import java.util.List;
 
-import org.fontbox.util.BoundingBox;
+import org.apache.fontbox.util.BoundingBox;
 
 import org.apache.pdfbox.cos.COSNumber;
 import org.apache.pdfbox.cos.COSStream;
Index: src/main/java/org/apache/pdfbox/pdmodel/font/PDFont.java
===================================================================
--- src/main/java/org/apache/pdfbox/pdmodel/font/PDFont.java	(revision 763152)
+++ src/main/java/org/apache/pdfbox/pdmodel/font/PDFont.java	(working copy)
@@ -16,13 +16,13 @@
  */
 package org.apache.pdfbox.pdmodel.font;
 
-import org.fontbox.afm.AFMParser;
+import org.apache.fontbox.afm.AFMParser;
 
-import org.fontbox.afm.FontMetric;
+import org.apache.fontbox.afm.FontMetric;
 
-import org.fontbox.cmap.CMapParser;
+import org.apache.fontbox.cmap.CMapParser;
 
-import org.fontbox.cmap.CMap;
+import org.apache.fontbox.cmap.CMap;
 
 import org.apache.pdfbox.encoding.AFMEncoding;
 import org.apache.pdfbox.encoding.DictionaryEncoding;
Index: src/main/java/org/apache/pdfbox/pdmodel/common/PDRectangle.java
===================================================================
--- src/main/java/org/apache/pdfbox/pdmodel/common/PDRectangle.java	(revision 763152)
+++ src/main/java/org/apache/pdfbox/pdmodel/common/PDRectangle.java	(working copy)
@@ -21,7 +21,7 @@
 import org.apache.pdfbox.cos.COSFloat;
 import org.apache.pdfbox.cos.COSNumber;
 
-import org.fontbox.util.BoundingBox;
+import org.apache.fontbox.util.BoundingBox;
 
 import java.awt.Dimension;