diff --git a/src/net/java/sip/communicator/plugin/branding/AboutWindow.java b/src/net/java/sip/communicator/plugin/branding/AboutWindow.java
index f83b9ee7f..fc1e71b62 100644
--- a/src/net/java/sip/communicator/plugin/branding/AboutWindow.java
+++ b/src/net/java/sip/communicator/plugin/branding/AboutWindow.java
@@ -1,4 +1,4 @@
-package net.java.sip.communicator.plugin.splashscreen;
+package net.java.sip.communicator.plugin.branding;
 
 import java.awt.*;
 import java.awt.event.*;
@@ -178,13 +178,13 @@ public void hyperlinkUpdate(HyperlinkEvent e)
         if (e.getEventType() == HyperlinkEvent.EventType.ACTIVATED)
         {
             String href = e.getDescription();
-            ServiceReference serviceReference = SplashScreenActivator
+            ServiceReference serviceReference = BrandingActivator
                     .getBundleContext().getServiceReference(
                             BrowserLauncherService.class.getName());
 
             if (serviceReference != null)
             {
-                BrowserLauncherService browserLauncherService = (BrowserLauncherService) SplashScreenActivator
+                BrowserLauncherService browserLauncherService = (BrowserLauncherService) BrandingActivator
                         .getBundleContext().getService(serviceReference);
                 browserLauncherService.openURL(href);
 
diff --git a/src/net/java/sip/communicator/plugin/branding/BrandingActivator.java b/src/net/java/sip/communicator/plugin/branding/BrandingActivator.java
index 339e0cc28..fcfe64219 100644
--- a/src/net/java/sip/communicator/plugin/branding/BrandingActivator.java
+++ b/src/net/java/sip/communicator/plugin/branding/BrandingActivator.java
@@ -4,7 +4,7 @@
  * Distributable under LGPL license.
  * See terms of license at gnu.org.
  */
-package net.java.sip.communicator.plugin.splashscreen;
+package net.java.sip.communicator.plugin.branding;
 
 import java.awt.event.*;
 
@@ -14,7 +14,7 @@
 
 import org.osgi.framework.*;
 
-public class SplashScreenActivator implements BundleActivator, BundleListener
+public class BrandingActivator implements BundleActivator, BundleListener
 {
     private WelcomeWindow welcomeWindow;
     private static BundleContext bundleContext;
diff --git a/src/net/java/sip/communicator/plugin/branding/Constants.java b/src/net/java/sip/communicator/plugin/branding/Constants.java
index 08999115d..f2923b708 100644
--- a/src/net/java/sip/communicator/plugin/branding/Constants.java
+++ b/src/net/java/sip/communicator/plugin/branding/Constants.java
@@ -5,7 +5,7 @@
  * See terms of license at gnu.org.
  */
 
-package net.java.sip.communicator.plugin.splashscreen;
+package net.java.sip.communicator.plugin.branding;
 
 import java.awt.*;
 import java.io.*;
diff --git a/src/net/java/sip/communicator/plugin/branding/Resources.java b/src/net/java/sip/communicator/plugin/branding/Resources.java
index 836b4243a..238bf6c42 100644
--- a/src/net/java/sip/communicator/plugin/branding/Resources.java
+++ b/src/net/java/sip/communicator/plugin/branding/Resources.java
@@ -1,72 +1,72 @@
-/*
- * SIP Communicator, the OpenSource Java VoIP and Instant Messaging client.
- *
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */
-package net.java.sip.communicator.plugin.splashscreen;
-
-import java.text.*;
-import java.util.*;
-
-/**
- * The Messages class manages the access to the internationalization properties
- * files.
- *
- * @author Yana Stamcheva
- */
-public class Resources
-{
-    private static final String RESOUCRE_LOCATION
-        = "net.java.sip.communicator.plugin.splashscreen.resources";
-
-    private static final ResourceBundle resourceBundle 
-        = ResourceBundle.getBundle(RESOUCRE_LOCATION);
-
-    /**
-     * Returns an internationalized string corresponding to the given key.
-     *
-     * @param key The key of the string.
-     * @return An internationalized string corresponding to the given key.
-     */
-    public static String getString(String key)
-    {
-        try
-        {
-            return resourceBundle.getString(key);
-        }
-        catch (MissingResourceException e)
-        {
-            return '!' + key + '!';
-        }
-    }
-    
-    /**
-     * Returns an internationalized string corresponding to the given key,
-     * by replacing all occurences of '?' with the given string param.
-     * @param key The key of the string.
-     * @param params the params, that should replace {1}, {2}, etc. in the
-     * string given by the key parameter 
-     * @return An internationalized string corresponding to the given key,
-     * by replacing all occurences of {#number} with the given string param.
-     */
-    public static String getString(String key, String[] params)
-    {
-        String resourceString;
-
-        try
-        {
-            resourceString = resourceBundle.getString(key);
-
-            resourceString = MessageFormat.format(
-                resourceString, (Object[]) params);
-
-        }
-        catch (MissingResourceException e)
-        {
-            resourceString = '!' + key + '!';
-        }
-
-        return resourceString;
-    }
-}
\ No newline at end of file
+/*
+ * SIP Communicator, the OpenSource Java VoIP and Instant Messaging client.
+ *
+ * Distributable under LGPL license.
+ * See terms of license at gnu.org.
+ */
+package net.java.sip.communicator.plugin.branding;
+
+import java.text.*;
+import java.util.*;
+
+/**
+ * The Messages class manages the access to the internationalization properties
+ * files.
+ *
+ * @author Yana Stamcheva
+ */
+public class Resources
+{
+    private static final String RESOUCRE_LOCATION
+        = "net.java.sip.communicator.plugin.branding.resources";
+
+    private static final ResourceBundle resourceBundle 
+        = ResourceBundle.getBundle(RESOUCRE_LOCATION);
+
+    /**
+     * Returns an internationalized string corresponding to the given key.
+     *
+     * @param key The key of the string.
+     * @return An internationalized string corresponding to the given key.
+     */
+    public static String getString(String key)
+    {
+        try
+        {
+            return resourceBundle.getString(key);
+        }
+        catch (MissingResourceException e)
+        {
+            return '!' + key + '!';
+        }
+    }
+    
+    /**
+     * Returns an internationalized string corresponding to the given key,
+     * by replacing all occurences of '?' with the given string param.
+     * @param key The key of the string.
+     * @param params the params, that should replace {1}, {2}, etc. in the
+     * string given by the key parameter 
+     * @return An internationalized string corresponding to the given key,
+     * by replacing all occurences of {#number} with the given string param.
+     */
+    public static String getString(String key, String[] params)
+    {
+        String resourceString;
+
+        try
+        {
+            resourceString = resourceBundle.getString(key);
+
+            resourceString = MessageFormat.format(
+                resourceString, (Object[]) params);
+
+        }
+        catch (MissingResourceException e)
+        {
+            resourceString = '!' + key + '!';
+        }
+
+        return resourceString;
+    }
+}
diff --git a/src/net/java/sip/communicator/plugin/branding/SIPCommHTMLEditorKit.java b/src/net/java/sip/communicator/plugin/branding/SIPCommHTMLEditorKit.java
index 7125769b5..086a4f562 100644
--- a/src/net/java/sip/communicator/plugin/branding/SIPCommHTMLEditorKit.java
+++ b/src/net/java/sip/communicator/plugin/branding/SIPCommHTMLEditorKit.java
@@ -5,7 +5,7 @@
  * See terms of license at gnu.org.
  */
 
-package net.java.sip.communicator.plugin.splashscreen;
+package net.java.sip.communicator.plugin.branding;
 
 import javax.swing.*;
 import javax.swing.text.*;
diff --git a/src/net/java/sip/communicator/plugin/branding/SIPCommImageView.java b/src/net/java/sip/communicator/plugin/branding/SIPCommImageView.java
index dbbfc3326..a8b995090 100644
--- a/src/net/java/sip/communicator/plugin/branding/SIPCommImageView.java
+++ b/src/net/java/sip/communicator/plugin/branding/SIPCommImageView.java
@@ -5,7 +5,7 @@
  * See terms of license at gnu.org.
  */
 
-package net.java.sip.communicator.plugin.splashscreen;
+package net.java.sip.communicator.plugin.branding;
 
 import java.io.*;
 import java.net.*;
diff --git a/src/net/java/sip/communicator/plugin/branding/StyledHTMLEditorPane.java b/src/net/java/sip/communicator/plugin/branding/StyledHTMLEditorPane.java
index 9502a89ae..5d61912f9 100644
--- a/src/net/java/sip/communicator/plugin/branding/StyledHTMLEditorPane.java
+++ b/src/net/java/sip/communicator/plugin/branding/StyledHTMLEditorPane.java
@@ -4,7 +4,7 @@
  * Distributable under LGPL license.
  * See terms of license at gnu.org.
  */
-package net.java.sip.communicator.plugin.splashscreen;
+package net.java.sip.communicator.plugin.branding;
 
 import java.io.IOException;
 
diff --git a/src/net/java/sip/communicator/plugin/branding/WelcomeWindow.java b/src/net/java/sip/communicator/plugin/branding/WelcomeWindow.java
index d8d01bb66..e616e00a3 100644
--- a/src/net/java/sip/communicator/plugin/branding/WelcomeWindow.java
+++ b/src/net/java/sip/communicator/plugin/branding/WelcomeWindow.java
@@ -1,4 +1,4 @@
-package net.java.sip.communicator.plugin.splashscreen;
+package net.java.sip.communicator.plugin.branding;
 
 import java.awt.*;
 import java.awt.event.*;
diff --git a/src/net/java/sip/communicator/plugin/branding/WindowBackground.java b/src/net/java/sip/communicator/plugin/branding/WindowBackground.java
index f2d00a793..351508c52 100644
--- a/src/net/java/sip/communicator/plugin/branding/WindowBackground.java
+++ b/src/net/java/sip/communicator/plugin/branding/WindowBackground.java
@@ -1,4 +1,4 @@
-package net.java.sip.communicator.plugin.splashscreen;
+package net.java.sip.communicator.plugin.branding;
 
 import java.awt.*;
 import java.io.*;
diff --git a/src/net/java/sip/communicator/plugin/branding/branding.manifest.mf b/src/net/java/sip/communicator/plugin/branding/branding.manifest.mf
index 12cd0c270..4a6a2bc28 100755
--- a/src/net/java/sip/communicator/plugin/branding/branding.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/branding/branding.manifest.mf
@@ -1,6 +1,6 @@
-Bundle-Activator: net.java.sip.communicator.plugin.splashscreen.SplashScreenActivator
-Bundle-Name: Splash Screen plugin
-Bundle-Description: Splash Screen plugin.
+Bundle-Activator: net.java.sip.communicator.plugin.branding.BrandingActivator
+Bundle-Name: Branding plugin
+Bundle-Description: Branding plugin.
 Bundle-Vendor: sip-communicator.org
 Bundle-Version: 0.0.1
 Import-Package: org.osgi.framework,