diff --git a/app/tools/Archiver.java b/app/tools/Archiver.java
index 6e8a55ae5..940cca897 100755
--- a/app/tools/Archiver.java
+++ b/app/tools/Archiver.java
@@ -32,7 +32,7 @@ import java.util.zip.*;
 
 
 public class Archiver {
-  PdeEditor editor;
+  Editor editor;
 
   // someday these will be settable
   boolean useDate = false;
@@ -42,7 +42,7 @@ public class Archiver {
   SimpleDateFormat dateFormat;
 
 
-  public Archiver(PdeEditor editor) {
+  public Archiver(Editor editor) {
     this.editor = editor;
 
     numberFormat = NumberFormat.getInstance();
@@ -122,7 +122,7 @@ public class Archiver {
         ZipEntry entry = new ZipEntry(nowfar);
         entry.setTime(sub.lastModified());
         zos.putNextEntry(entry);
-        zos.write(PdeBase.grabFile(sub));
+        zos.write(Base.grabFile(sub));
         zos.closeEntry();
       }
     }
diff --git a/app/tools/CreateFont.java b/app/tools/CreateFont.java
index 127934497..c4b2db2ea 100644
--- a/app/tools/CreateFont.java
+++ b/app/tools/CreateFont.java
@@ -65,7 +65,7 @@ public class CreateFont extends JFrame {
   };
 
 
-  public CreateFont(PdeEditor editor) {
+  public CreateFont(Editor editor) {
     super("Create Font");
 
     targetFolder = editor.sketch.dataFolder;
@@ -271,7 +271,7 @@ public class CreateFont extends JFrame {
 
     /*
     JLabel rec = new JLabel("(Recommended size for 3D use is 48 points)");
-    if (PdeBase.platform == PdeBase.MACOSX) {
+    if (Base.platform == Base.MACOSX) {
       rec.setFont(new Font("Dialog", Font.PLAIN, 10));
     }
     panel.add(rec);