diff --git a/java/src/com/tigervnc/decoder/CoRREDecoder.java b/java/src/com/tigervnc/decoder/CoRREDecoder.java
index bc08668..dd50925 100644
--- a/java/src/com/tigervnc/decoder/CoRREDecoder.java
+++ b/java/src/com/tigervnc/decoder/CoRREDecoder.java
@@ -1,6 +1,6 @@
-package com.tightvnc.decoder;
+package com.tigervnc.decoder;
 
-import com.tightvnc.vncviewer.RfbInputStream;
+import com.tigervnc.vncviewer.RfbInputStream;
 import java.awt.Graphics;
 import java.awt.Color;
 import java.io.IOException;
diff --git a/java/src/com/tigervnc/decoder/CopyRectDecoder.java b/java/src/com/tigervnc/decoder/CopyRectDecoder.java
index 07a14bd..c3f1c8c 100644
--- a/java/src/com/tigervnc/decoder/CopyRectDecoder.java
+++ b/java/src/com/tigervnc/decoder/CopyRectDecoder.java
@@ -1,6 +1,6 @@
-package com.tightvnc.decoder;
+package com.tigervnc.decoder;
 
-import com.tightvnc.vncviewer.RfbInputStream;
+import com.tigervnc.vncviewer.RfbInputStream;
 import java.awt.Graphics;
 import java.io.IOException;
 
diff --git a/java/src/com/tigervnc/decoder/HextileDecoder.java b/java/src/com/tigervnc/decoder/HextileDecoder.java
index da7e778..7052ff4 100644
--- a/java/src/com/tigervnc/decoder/HextileDecoder.java
+++ b/java/src/com/tigervnc/decoder/HextileDecoder.java
@@ -1,7 +1,7 @@
-package com.tightvnc.decoder;
+package com.tigervnc.decoder;
 
-import com.tightvnc.decoder.common.Repaintable;
-import com.tightvnc.vncviewer.RfbInputStream;
+import com.tigervnc.decoder.common.Repaintable;
+import com.tigervnc.vncviewer.RfbInputStream;
 import java.awt.Color;
 import java.awt.Graphics;
 import java.io.IOException;
diff --git a/java/src/com/tigervnc/decoder/RREDecoder.java b/java/src/com/tigervnc/decoder/RREDecoder.java
index 02eb513..f6a67ae 100644
--- a/java/src/com/tigervnc/decoder/RREDecoder.java
+++ b/java/src/com/tigervnc/decoder/RREDecoder.java
@@ -1,6 +1,6 @@
-package com.tightvnc.decoder;
+package com.tigervnc.decoder;
 
-import com.tightvnc.vncviewer.RfbInputStream;
+import com.tigervnc.vncviewer.RfbInputStream;
 import java.awt.Graphics;
 import java.awt.Color;
 import java.io.ByteArrayInputStream;
diff --git a/java/src/com/tigervnc/decoder/RawDecoder.java b/java/src/com/tigervnc/decoder/RawDecoder.java
index 9ef167a..478a668 100644
--- a/java/src/com/tigervnc/decoder/RawDecoder.java
+++ b/java/src/com/tigervnc/decoder/RawDecoder.java
@@ -1,6 +1,6 @@
-package com.tightvnc.decoder;
+package com.tigervnc.decoder;
 
-import com.tightvnc.vncviewer.RfbInputStream;
+import com.tigervnc.vncviewer.RfbInputStream;
 import java.io.IOException;
 import java.io.DataOutput;
 import java.awt.Graphics;
diff --git a/java/src/com/tigervnc/decoder/TightDecoder.java b/java/src/com/tigervnc/decoder/TightDecoder.java
index 015f73c..4e9969c 100644
--- a/java/src/com/tigervnc/decoder/TightDecoder.java
+++ b/java/src/com/tigervnc/decoder/TightDecoder.java
@@ -1,7 +1,7 @@
-package com.tightvnc.decoder;
+package com.tigervnc.decoder;
 
-import com.tightvnc.decoder.common.Repaintable;
-import com.tightvnc.vncviewer.RfbInputStream;
+import com.tigervnc.decoder.common.Repaintable;
+import com.tigervnc.vncviewer.RfbInputStream;
 import java.awt.Graphics;
 import java.awt.Color;
 import java.awt.Image;
diff --git a/java/src/com/tigervnc/decoder/ZRLEDecoder.java b/java/src/com/tigervnc/decoder/ZRLEDecoder.java
index a22da90..91a9f9d 100644
--- a/java/src/com/tigervnc/decoder/ZRLEDecoder.java
+++ b/java/src/com/tigervnc/decoder/ZRLEDecoder.java
@@ -1,10 +1,10 @@
-package com.tightvnc.decoder;
+package com.tigervnc.decoder;
 
-import com.tightvnc.vncviewer.InStream;
-import com.tightvnc.vncviewer.RfbInputStream;
-import com.tightvnc.vncviewer.ZlibInStream;
+import com.tigervnc.vncviewer.InStream;
+import com.tigervnc.vncviewer.RfbInputStream;
+import com.tigervnc.vncviewer.ZlibInStream;
 import java.awt.Graphics;
-import com.tightvnc.vncviewer.MemInStream;
+import com.tigervnc.vncviewer.MemInStream;
 import java.awt.Color;
 import java.awt.Toolkit;
 import java.awt.image.MemoryImageSource;
diff --git a/java/src/com/tigervnc/decoder/ZlibDecoder.java b/java/src/com/tigervnc/decoder/ZlibDecoder.java
index 1370da1..0eeaef5 100644
--- a/java/src/com/tigervnc/decoder/ZlibDecoder.java
+++ b/java/src/com/tigervnc/decoder/ZlibDecoder.java
@@ -1,6 +1,6 @@
-package com.tightvnc.decoder;
+package com.tigervnc.decoder;
 
-import com.tightvnc.vncviewer.RfbInputStream;
+import com.tigervnc.vncviewer.RfbInputStream;
 import java.awt.Graphics;
 import java.io.IOException;
 import java.util.zip.DataFormatException;
diff --git a/java/src/com/tigervnc/decoder/common/Repaintable.java b/java/src/com/tigervnc/decoder/common/Repaintable.java
index de11f4c..896f09f 100644
--- a/java/src/com/tigervnc/decoder/common/Repaintable.java
+++ b/java/src/com/tigervnc/decoder/common/Repaintable.java
@@ -1,4 +1,4 @@
-package com.tightvnc.decoder.common;
+package com.tigervnc.decoder.common;
 
 public interface Repaintable {
 
diff --git a/java/src/com/tigervnc/vncviewer/AuthPanel.java b/java/src/com/tigervnc/vncviewer/AuthPanel.java
index 28be721..04d3bde 100644
--- a/java/src/com/tigervnc/vncviewer/AuthPanel.java
+++ b/java/src/com/tigervnc/vncviewer/AuthPanel.java
@@ -18,7 +18,7 @@
 //  USA.
 //
 
-package com.tightvnc.vncviewer;
+package com.tigervnc.vncviewer;
 
 import java.awt.*;
 import java.awt.event.*;
diff --git a/java/src/com/tigervnc/vncviewer/ButtonPanel.java b/java/src/com/tigervnc/vncviewer/ButtonPanel.java
index 985a9c2..c8ca77c 100644
--- a/java/src/com/tigervnc/vncviewer/ButtonPanel.java
+++ b/java/src/com/tigervnc/vncviewer/ButtonPanel.java
@@ -23,7 +23,7 @@
 // VNCViewer desktop window.
 //
 
-package com.tightvnc.vncviewer;
+package com.tigervnc.vncviewer;
 
 import java.awt.*;
 import java.awt.event.*;
diff --git a/java/src/com/tigervnc/vncviewer/CapabilityInfo.java b/java/src/com/tigervnc/vncviewer/CapabilityInfo.java
index 092f53e..8f01d77 100644
--- a/java/src/com/tigervnc/vncviewer/CapabilityInfo.java
+++ b/java/src/com/tigervnc/vncviewer/CapabilityInfo.java
@@ -22,7 +22,7 @@
 // particular capability as used in the RFB protocol 3.130.
 //
 
-package com.tightvnc.vncviewer;
+package com.tigervnc.vncviewer;
 
 class CapabilityInfo {
 
diff --git a/java/src/com/tigervnc/vncviewer/CapsContainer.java b/java/src/com/tigervnc/vncviewer/CapsContainer.java
index b9acbf4..5f2e615 100644
--- a/java/src/com/tigervnc/vncviewer/CapsContainer.java
+++ b/java/src/com/tigervnc/vncviewer/CapsContainer.java
@@ -22,7 +22,7 @@
 // protocol 3.130
 //
 
-package com.tightvnc.vncviewer;
+package com.tigervnc.vncviewer;
 
 import java.util.Vector;
 import java.util.Hashtable;
diff --git a/java/src/com/tigervnc/vncviewer/ClipboardFrame.java b/java/src/com/tigervnc/vncviewer/ClipboardFrame.java
index 2b11eb8..a09519c 100644
--- a/java/src/com/tigervnc/vncviewer/ClipboardFrame.java
+++ b/java/src/com/tigervnc/vncviewer/ClipboardFrame.java
@@ -22,7 +22,7 @@
 // Clipboard frame.
 //
 
-package com.tightvnc.vncviewer;
+package com.tigervnc.vncviewer;
 
 import java.awt.*;
 import java.awt.event.*;
diff --git a/java/src/com/tigervnc/vncviewer/DesCipher.java b/java/src/com/tigervnc/vncviewer/DesCipher.java
index 9ebeaa8..25362fe 100644
--- a/java/src/com/tigervnc/vncviewer/DesCipher.java
+++ b/java/src/com/tigervnc/vncviewer/DesCipher.java
@@ -70,7 +70,7 @@
 // fine Java utilities: http://www.acme.com/java/
 
 
-package com.tightvnc.vncviewer;
+package com.tigervnc.vncviewer;
 
 import java.io.*;
 
diff --git a/java/src/com/tigervnc/vncviewer/HTTPConnectSocket.java b/java/src/com/tigervnc/vncviewer/HTTPConnectSocket.java
index c427b06..2a66b25 100644
--- a/java/src/com/tigervnc/vncviewer/HTTPConnectSocket.java
+++ b/java/src/com/tigervnc/vncviewer/HTTPConnectSocket.java
@@ -23,7 +23,7 @@
 // HTTP proxies supporting the HTTP CONNECT method.
 //
 
-package com.tightvnc.vncviewer;
+package com.tigervnc.vncviewer;
 
 import java.net.*;
 import java.io.*;
diff --git a/java/src/com/tigervnc/vncviewer/HTTPConnectSocketFactory.java b/java/src/com/tigervnc/vncviewer/HTTPConnectSocketFactory.java
index 3eae6f9..56c8b97 100644
--- a/java/src/com/tigervnc/vncviewer/HTTPConnectSocketFactory.java
+++ b/java/src/com/tigervnc/vncviewer/HTTPConnectSocketFactory.java
@@ -23,7 +23,7 @@
 // HTTP proxies supporting the HTTP CONNECT method.
 //
 
-package com.tightvnc.vncviewer;
+package com.tigervnc.vncviewer;
 
 import java.applet.*;
 import java.net.*;
diff --git a/java/src/com/tigervnc/vncviewer/InStream.java b/java/src/com/tigervnc/vncviewer/InStream.java
index ecb03d9..75ff91a 100644
--- a/java/src/com/tigervnc/vncviewer/InStream.java
+++ b/java/src/com/tigervnc/vncviewer/InStream.java
@@ -21,7 +21,7 @@
 // Representation).
 //
 
-package com.tightvnc.vncviewer;
+package com.tigervnc.vncviewer;
 
 abstract public class InStream {
 
diff --git a/java/src/com/tigervnc/vncviewer/MemInStream.java b/java/src/com/tigervnc/vncviewer/MemInStream.java
index 7427a9a..41a4fc0 100644
--- a/java/src/com/tigervnc/vncviewer/MemInStream.java
+++ b/java/src/com/tigervnc/vncviewer/MemInStream.java
@@ -16,7 +16,7 @@
  * USA.
  */
 
-package com.tightvnc.vncviewer;
+package com.tigervnc.vncviewer;
 
 public class MemInStream extends InStream {
 
diff --git a/java/src/com/tigervnc/vncviewer/OptionsFrame.java b/java/src/com/tigervnc/vncviewer/OptionsFrame.java
index e1125f4..6a50de4 100644
--- a/java/src/com/tigervnc/vncviewer/OptionsFrame.java
+++ b/java/src/com/tigervnc/vncviewer/OptionsFrame.java
@@ -27,7 +27,7 @@
 // It sets the encodings array and some booleans.
 //
 
-package com.tightvnc.vncviewer;
+package com.tigervnc.vncviewer;
 
 import java.awt.*;
 import java.awt.event.*;
diff --git a/java/src/com/tigervnc/vncviewer/RecordOutputStream.java b/java/src/com/tigervnc/vncviewer/RecordOutputStream.java
index 3978dfc..7f13249 100644
--- a/java/src/com/tigervnc/vncviewer/RecordOutputStream.java
+++ b/java/src/com/tigervnc/vncviewer/RecordOutputStream.java
@@ -1,4 +1,4 @@
-package com.tightvnc.vncviewer;
+package com.tigervnc.vncviewer;
 
 import java.io.DataOutput;
 import java.io.IOException;
diff --git a/java/src/com/tigervnc/vncviewer/RecordingFrame.java b/java/src/com/tigervnc/vncviewer/RecordingFrame.java
index f2e1fae..6bf40ea 100644
--- a/java/src/com/tigervnc/vncviewer/RecordingFrame.java
+++ b/java/src/com/tigervnc/vncviewer/RecordingFrame.java
@@ -22,7 +22,7 @@
 // FBS (FrameBuffer Stream) files.
 //
 
-package com.tightvnc.vncviewer;
+package com.tigervnc.vncviewer;
 
 import java.io.*;
 import java.awt.*;
diff --git a/java/src/com/tigervnc/vncviewer/ReloginPanel.java b/java/src/com/tigervnc/vncviewer/ReloginPanel.java
index 4be454d..51d9d21 100644
--- a/java/src/com/tigervnc/vncviewer/ReloginPanel.java
+++ b/java/src/com/tigervnc/vncviewer/ReloginPanel.java
@@ -23,7 +23,7 @@
 // after fatal errors or disconnect
 //
 
-package com.tightvnc.vncviewer;
+package com.tigervnc.vncviewer;
 
 import java.awt.*;
 import java.awt.event.*;
diff --git a/java/src/com/tigervnc/vncviewer/RfbInputStream.java b/java/src/com/tigervnc/vncviewer/RfbInputStream.java
index c14b188..cac3ec7 100644
--- a/java/src/com/tigervnc/vncviewer/RfbInputStream.java
+++ b/java/src/com/tigervnc/vncviewer/RfbInputStream.java
@@ -1,4 +1,4 @@
-package com.tightvnc.vncviewer;
+package com.tigervnc.vncviewer;
 
 import java.io.IOException;
 
@@ -6,7 +6,7 @@
 // This class is layer between data of private RfbProto class
 // and classes in other packages.
 //
-// For now this class is used by com.tightvnc.decoder.RawDecoder
+// For now this class is used by com.tigervnc.decoder.RawDecoder
 //
 public class RfbInputStream {
   RfbInputStream(RfbProto rfbProto) {
diff --git a/java/src/com/tigervnc/vncviewer/RfbProto.java b/java/src/com/tigervnc/vncviewer/RfbProto.java
index d1a9450..22cc113 100644
--- a/java/src/com/tigervnc/vncviewer/RfbProto.java
+++ b/java/src/com/tigervnc/vncviewer/RfbProto.java
@@ -24,7 +24,7 @@
 // RfbProto.java
 //
 
-package com.tightvnc.vncviewer;
+package com.tigervnc.vncviewer;
 
 import java.io.*;
 import java.awt.*;
diff --git a/java/src/com/tigervnc/vncviewer/SessionRecorder.java b/java/src/com/tigervnc/vncviewer/SessionRecorder.java
index 9e73531..2ae7079 100644
--- a/java/src/com/tigervnc/vncviewer/SessionRecorder.java
+++ b/java/src/com/tigervnc/vncviewer/SessionRecorder.java
@@ -22,7 +22,7 @@
 // FBS files are used to save RFB sessions for later playback.
 //
 
-package com.tightvnc.vncviewer;
+package com.tigervnc.vncviewer;
 
 import java.io.*;
 
diff --git a/java/src/com/tigervnc/vncviewer/SocketFactory.java b/java/src/com/tigervnc/vncviewer/SocketFactory.java
index 966d1d3..30460dc 100644
--- a/java/src/com/tigervnc/vncviewer/SocketFactory.java
+++ b/java/src/com/tigervnc/vncviewer/SocketFactory.java
@@ -22,7 +22,7 @@
 // standard Socket class by its alternative implementations.
 //
 
-package com.tightvnc.vncviewer;
+package com.tigervnc.vncviewer;
 
 import java.applet.*;
 import java.net.*;
diff --git a/java/src/com/tigervnc/vncviewer/VncCanvas.java b/java/src/com/tigervnc/vncviewer/VncCanvas.java
index 4e5460f..05d8872 100644
--- a/java/src/com/tigervnc/vncviewer/VncCanvas.java
+++ b/java/src/com/tigervnc/vncviewer/VncCanvas.java
@@ -21,17 +21,17 @@
 //  USA.
 //
 
-package com.tightvnc.vncviewer;
+package com.tigervnc.vncviewer;
 
-import com.tightvnc.decoder.CoRREDecoder;
-import com.tightvnc.decoder.CopyRectDecoder;
-import com.tightvnc.decoder.HextileDecoder;
-import com.tightvnc.decoder.RREDecoder;
-import com.tightvnc.decoder.RawDecoder;
-import com.tightvnc.decoder.TightDecoder;
-import com.tightvnc.decoder.ZRLEDecoder;
-import com.tightvnc.decoder.ZlibDecoder;
-import com.tightvnc.decoder.common.Repaintable;
+import com.tigervnc.decoder.CoRREDecoder;
+import com.tigervnc.decoder.CopyRectDecoder;
+import com.tigervnc.decoder.HextileDecoder;
+import com.tigervnc.decoder.RREDecoder;
+import com.tigervnc.decoder.RawDecoder;
+import com.tigervnc.decoder.TightDecoder;
+import com.tigervnc.decoder.ZRLEDecoder;
+import com.tigervnc.decoder.ZlibDecoder;
+import com.tigervnc.decoder.common.Repaintable;
 import java.awt.*;
 import java.awt.event.*;
 import java.awt.image.*;
diff --git a/java/src/com/tigervnc/vncviewer/VncCanvas2.java b/java/src/com/tigervnc/vncviewer/VncCanvas2.java
index 502d26f..c39d4a5 100644
--- a/java/src/com/tigervnc/vncviewer/VncCanvas2.java
+++ b/java/src/com/tigervnc/vncviewer/VncCanvas2.java
@@ -17,7 +17,7 @@
 //  USA.
 //
 
-package com.tightvnc.vncviewer;
+package com.tigervnc.vncviewer;
 
 import java.awt.*;
 import java.io.*;
diff --git a/java/src/com/tigervnc/vncviewer/VncViewer.java b/java/src/com/tigervnc/vncviewer/VncViewer.java
index bdaee68..3c527ba 100644
--- a/java/src/com/tigervnc/vncviewer/VncViewer.java
+++ b/java/src/com/tigervnc/vncviewer/VncViewer.java
@@ -25,7 +25,7 @@
 // a VNC desktop.
 //
 
-package com.tightvnc.vncviewer;
+package com.tigervnc.vncviewer;
 
 import java.awt.*;
 import java.awt.event.*;
@@ -288,7 +288,7 @@
       // This throws ClassNotFoundException if there is no Java 2D API.
       Class cl = Class.forName("java.awt.Graphics2D");
       // If we could load Graphics2D class, then we can use VncCanvas2D.
-      cl = Class.forName("com.tightvnc.vncviewer.VncCanvas2");
+      cl = Class.forName("com.tigervnc.vncviewer.VncCanvas2");
       Class[] argClasses = { this.getClass(), Integer.TYPE, Integer.TYPE };
       java.lang.reflect.Constructor cstr = cl.getConstructor(argClasses);
       Object[] argObjects =
diff --git a/java/src/com/tigervnc/vncviewer/ZlibInStream.java b/java/src/com/tigervnc/vncviewer/ZlibInStream.java
index 636fb54..2f2a3c0 100644
--- a/java/src/com/tigervnc/vncviewer/ZlibInStream.java
+++ b/java/src/com/tigervnc/vncviewer/ZlibInStream.java
@@ -20,7 +20,7 @@
 // A ZlibInStream reads from a zlib.io.InputStream
 //
 
-package com.tightvnc.vncviewer;
+package com.tigervnc.vncviewer;
 
 public class ZlibInStream extends InStream {