--- jhove-1.20.1.orig/jhove-apps/src/main/java/edu/harvard/hul/ois/jhove/viewer/ModuleInfoWindow.java
+++ jhove-1.20.1/jhove-apps/src/main/java/edu/harvard/hul/ois/jhove/viewer/ModuleInfoWindow.java
@@ -24,7 +24,7 @@ public class ModuleInfoWindow extends In
 
     private JTextArea texta;
     private int _level;
-    private Module _module;
+    private edu.harvard.hul.ois.jhove.Module _module;
 
     /**
      *  Constructor.
@@ -33,7 +33,7 @@ public class ModuleInfoWindow extends In
      *  @param base   The associated JhoveBase object.
      *  @param module The Module whose information is to be presented.
      */
-    public ModuleInfoWindow (App app, JhoveBase base, Module module) 
+    public ModuleInfoWindow (App app, JhoveBase base, edu.harvard.hul.ois.jhove.Module module) 
     {
         super ("Module Info", app, base);
         _module = module;
@@ -73,7 +73,7 @@ public class ModuleInfoWindow extends In
 
     /** Formats and presents the module information in 
      *  the window. */
-    public void showModule (Module module)
+    public void showModule (edu.harvard.hul.ois.jhove.Module module)
     {
         _module = module;
         if (module == null) {
--- jhove-1.20.1.orig/jhove-apps/src/main/java/edu/harvard/hul/ois/jhove/viewer/ViewHandler.java
+++ jhove-1.20.1/jhove-apps/src/main/java/edu/harvard/hul/ois/jhove/viewer/ViewHandler.java
@@ -98,7 +98,7 @@ public class ViewHandler extends Handler
     {
     }
     
-    public void show (Module module)
+    public void show (edu.harvard.hul.ois.jhove.Module module)
     {
     }
 
--- jhove-1.20.1.orig/jhove-apps/src/main/java/edu/harvard/hul/ois/jhove/viewer/AppInfoWindow.java
+++ jhove-1.20.1/jhove-apps/src/main/java/edu/harvard/hul/ois/jhove/viewer/AppInfoWindow.java
@@ -90,7 +90,7 @@ public class AppInfoWindow extends InfoW
 	while (iter.hasNext ()) {
 	    //Module module = jbase.getModuleMap ((String) iter.next ());
             Map moduleMap = jbase.getModuleMap ();
-            Module module = (Module) moduleMap.get ((String) iter.next ());
+            edu.harvard.hul.ois.jhove.Module module = (edu.harvard.hul.ois.jhove.Module) moduleMap.get ((String) iter.next ());
 	    texta.append (" Module: " + module.getName () + " " +
 			  module.getRelease () + eol);
 	}
--- jhove-1.20.1.orig/jhove-apps/src/main/java/edu/harvard/hul/ois/jhove/viewer/RepTreeRoot.java
+++ jhove-1.20.1/jhove-apps/src/main/java/edu/harvard/hul/ois/jhove/viewer/RepTreeRoot.java
@@ -217,7 +217,7 @@ public class RepTreeRoot extends Default
     {
         // This node has two children, for the module and the RepInfo 
 
-        Module module = _info.getModule ();
+        edu.harvard.hul.ois.jhove.Module module = _info.getModule ();
         if (module != null) {
             // Create a subnode for the module, which has three
             // leaf children.
--- jhove-1.20.1.orig/jhove-apps/src/main/java/edu/harvard/hul/ois/jhove/viewer/JhoveWindow.java
+++ jhove-1.20.1/jhove-apps/src/main/java/edu/harvard/hul/ois/jhove/viewer/JhoveWindow.java
@@ -107,10 +107,10 @@ public class JhoveWindow extends JFrame
         setDefaultCloseOperation (JFrame.EXIT_ON_CLOSE);
         
         // Define a Comparator function for Modules
-        Comparator<Module> modListComparator = new Comparator<Module> () {
-            public int compare (Module o1, Module o2) {
-                Module m1 = (Module) o1;
-                Module m2 = (Module) o2;
+        Comparator<edu.harvard.hul.ois.jhove.Module> modListComparator = new Comparator<edu.harvard.hul.ois.jhove.Module> () {
+            public int compare (edu.harvard.hul.ois.jhove.Module o1, edu.harvard.hul.ois.jhove.Module o2) {
+                edu.harvard.hul.ois.jhove.Module m1 = (edu.harvard.hul.ois.jhove.Module) o1;
+                edu.harvard.hul.ois.jhove.Module m2 = (edu.harvard.hul.ois.jhove.Module) o2;
                 String name1 = m1.getName ();
                 String name2 = m2.getName ();
                 return String.CASE_INSENSITIVE_ORDER.compare (name1, name2);
@@ -119,19 +119,19 @@ public class JhoveWindow extends JFrame
 
         // Build combo box of available modules
         Vector<String> moduleItems = new Vector<String> (10);
-        java.util.List<Module> moduleList = base.getModuleList ();
+        java.util.List<edu.harvard.hul.ois.jhove.Module> moduleList = base.getModuleList ();
         // Clone the list so we can display it in sorted order
         // without munging the app's preferred order
-        java.util.List<Module> menuModuleList = new ArrayList<Module> (moduleList.size ());
+        java.util.List<edu.harvard.hul.ois.jhove.Module> menuModuleList = new ArrayList<edu.harvard.hul.ois.jhove.Module> (moduleList.size ());
         menuModuleList.addAll(moduleList);
         Collections.sort (menuModuleList, modListComparator);
-        Iterator<Module> iter = menuModuleList.iterator ();
+        Iterator<edu.harvard.hul.ois.jhove.Module> iter = menuModuleList.iterator ();
         moduleItems.add ("(None selected)");
         JRadioButtonMenuItem modItem = null;
         String itemName = null;
         
         while (iter.hasNext ()) {
-            Module mod = iter.next ();
+            edu.harvard.hul.ois.jhove.Module mod = iter.next ();
             itemName = mod.getName ();
             modItem = new JRadioButtonMenuItem (itemName);
             modItem.setActionCommand (itemName);
@@ -365,7 +365,7 @@ public class JhoveWindow extends JFrame
      *  This method does the actual work of pickAndAnalyzeFile,
      *  called from a thread so it can run asynchronously. 
      */
-    public void pickAndAnalyzeFile1 (File file, Module module)
+    public void pickAndAnalyzeFile1 (File file, edu.harvard.hul.ois.jhove.Module module)
     {
         String name = file.getName ();
         _base.resetAbort ();
@@ -390,7 +390,7 @@ public class JhoveWindow extends JFrame
     }
     
     /** This is called to analyze a List of files. */
-    public void pickAndAnalyzeFileList1 (List<File> files, Module module)
+    public void pickAndAnalyzeFileList1 (List<File> files, edu.harvard.hul.ois.jhove.Module module)
     {
         if (files.isEmpty ()) {
             return;
@@ -421,7 +421,7 @@ public class JhoveWindow extends JFrame
      *  levels if possible, and feeding individual files to 
      *  pickAndAnalyzeFile1.
      */
-    public void analyzeDirectory (File file, Module module)
+    public void analyzeDirectory (File file, edu.harvard.hul.ois.jhove.Module module)
     {
         // Construct list, excluding files that start with "."
         String[] subfiles = file.list (invisibleFilter);
@@ -483,7 +483,7 @@ public class JhoveWindow extends JFrame
      *  This method does the actual work of pickAndAnalyzeURL,
      *  called from a thread so it can run asynchronously. 
      */
-    public void pickAndAnalyzeURL1 (String uri, Module module)
+    public void pickAndAnalyzeURL1 (String uri, edu.harvard.hul.ois.jhove.Module module)
     {
         _progWind.setDocName (uri.toString (), false);
         _progWind.setProgressState (ProgressWindow.DOWNLOADING, false);
@@ -562,7 +562,7 @@ public class JhoveWindow extends JFrame
         _doChecksum = checksum;
     }
   
-    private void openAndParse (List<File> files, /* RepInfo info,*/ Module module)
+    private void openAndParse (List<File> files, /* RepInfo info,*/ edu.harvard.hul.ois.jhove.Module module)
     {
         //InputStream stream = null;
         //long lastModified = 0;
@@ -671,7 +671,7 @@ public class JhoveWindow extends JFrame
 
     private void showModuleInfo ()
     {
-        Module module = getSelectedModule ();
+        edu.harvard.hul.ois.jhove.Module module = getSelectedModule ();
         if (_moduleInfoWin == null) {
             _moduleInfoWin = new ModuleInfoWindow (_app, _base, module);
             _moduleInfoWin.setLocation (moduleInfoWinXPos, moduleInfoWinYPos);
@@ -694,12 +694,12 @@ public class JhoveWindow extends JFrame
 
 
 
-    private Module getSelectedModule ()
+    private edu.harvard.hul.ois.jhove.Module getSelectedModule ()
     {
         if (_selectedModule.equals ("")) {
             return null;
         }
-        return (Module) _base.getModuleMap().get (_selectedModule.toLowerCase ());
+        return (edu.harvard.hul.ois.jhove.Module) _base.getModuleMap().get (_selectedModule.toLowerCase ());
     }
 
     private void reportError (String title, String msg)
@@ -831,7 +831,7 @@ public class JhoveWindow extends JFrame
         private String _uri;
         private File _file;
         private List<File> _fileList;
-        private Module _module;
+        private edu.harvard.hul.ois.jhove.Module _module;
 
 
         /** Constructor. */
@@ -903,7 +903,7 @@ public class JhoveWindow extends JFrame
          *  thread setup, in case the user changes the module
          *  selection while the thread's running.
          */
-        protected void setModule (Module module)
+        protected void setModule (edu.harvard.hul.ois.jhove.Module module)
         {
             _module = module;
         }
--- jhove-1.20.1.orig/jhove-core/src/main/java/edu/harvard/hul/ois/jhove/handler/XmlHandler.java
+++ jhove-1.20.1/jhove-core/src/main/java/edu/harvard/hul/ois/jhove/handler/XmlHandler.java
@@ -161,7 +161,7 @@ public class XmlHandler
 	    _writer.println (margn2 + elementStart ("modules"));
         Iterator iter = _je.getModuleMap ().keySet ().iterator ();
         while (iter.hasNext ()) {
-            Module module = _je.getModule ((String) iter.next ());
+            edu.harvard.hul.ois.jhove.Module module = _je.getModule ((String) iter.next ());
 	        String [][] attr2 = { {"release", module.getRelease ()} };
             _writer.println (margn3 + element ("module", attr2,
 					       module.getName ()));
@@ -224,7 +224,7 @@ public class XmlHandler
     /**
      *  Outputs information about a Module
      */
-    public void show (Module module)
+    public void show (edu.harvard.hul.ois.jhove.Module module)
     {
         String margin = getIndent (++_level);
         String margn2 = margin + " ";
@@ -322,7 +322,7 @@ public class XmlHandler
         String margn2 = margin + " ";
         String margn3 = margn2 + " ";
 
-        Module module = info.getModule ();
+        edu.harvard.hul.ois.jhove.Module module = info.getModule ();
         _logger.info ("Reporting RepInfo");
         if (_je.getSignatureFlag ()) {
             _logger.info ("Checking signatures only");
--- jhove-1.20.1.orig/jhove-core/src/main/java/edu/harvard/hul/ois/jhove/handler/TextHandler.java
+++ jhove-1.20.1/jhove-core/src/main/java/edu/harvard/hul/ois/jhove/handler/TextHandler.java
@@ -121,7 +121,7 @@ public class TextHandler
 	_writer.println (margin + " BufferSize: " + _je.getBufferSize ());
         Iterator iter = _je.getModuleMap ().keySet ().iterator ();
         while (iter.hasNext ()) {
-            Module module = _je.getModule ((String) iter.next ());
+            edu.harvard.hul.ois.jhove.Module module = _je.getModule ((String) iter.next ());
             _writer.println (margin + " Module: " + module.getName () + " " +
 			     module.getRelease ());
         }
@@ -173,7 +173,7 @@ public class TextHandler
     /**
      *  Outputs information about a Module
      */
-    public void show (Module module)
+    public void show (edu.harvard.hul.ois.jhove.Module module)
     {
         String margin = getIndent (++_level);
 
@@ -251,7 +251,7 @@ public class TextHandler
     {
         String margin = getIndent (++_level);
 
-        Module module = info.getModule ();
+        edu.harvard.hul.ois.jhove.Module module = info.getModule ();
         _writer.println (margin + "RepresentationInformation: " +
                          info.getUri ());
         if (module != null) {
