RPC -> Rpc for consistency

34 files changed, 72 insertions, 72 deletions

diff --git a/src/com/vaadin/terminal/gwt/client/ui/ClickRPC.java b/src/com/vaadin/terminal/gwt/client/ui/ClickRpc.java
index 6c81b282e8..37d6443f55 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/ClickRPC.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/ClickRpc.java
@@ -6,7 +6,7 @@ package com.vaadin.terminal.gwt.client.ui;
 import com.vaadin.terminal.gwt.client.MouseEventDetails;
 import com.vaadin.terminal.gwt.client.communication.ServerRpc;
 
-public interface ClickRPC extends ServerRpc {
+public interface ClickRpc extends ServerRpc {
     /**
      * Called when a click event has occurred and there are server side
      * listeners for the event.
diff --git a/src/com/vaadin/terminal/gwt/client/ui/LayoutClickEventHandler.java b/src/com/vaadin/terminal/gwt/client/ui/LayoutClickEventHandler.java
index 09caa9ad82..7a5d85e34b 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/LayoutClickEventHandler.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/LayoutClickEventHandler.java
@@ -35,5 +35,5 @@ public abstract class LayoutClickEventHandler extends AbstractClickEventHandler
         getLayoutClickRPC().layoutClick(mouseDetails, getChildComponent(event));
     }
 
-    protected abstract LayoutClickRPC getLayoutClickRPC();
+    protected abstract LayoutClickRpc getLayoutClickRPC();
 }
diff --git a/src/com/vaadin/terminal/gwt/client/ui/LayoutClickRPC.java b/src/com/vaadin/terminal/gwt/client/ui/LayoutClickRpc.java
index 20b9c8750b..5b76f398a9 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/LayoutClickRPC.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/LayoutClickRpc.java
@@ -7,7 +7,7 @@ import com.vaadin.terminal.gwt.client.Connector;
 import com.vaadin.terminal.gwt.client.MouseEventDetails;
 import com.vaadin.terminal.gwt.client.communication.ServerRpc;
 
-public interface LayoutClickRPC extends ServerRpc {
+public interface LayoutClickRpc extends ServerRpc {
     /**
      * Called when a layout click event has occurred and there are server side
      * listeners for the event.
diff --git a/src/com/vaadin/terminal/gwt/client/ui/absolutelayout/AbsoluteLayoutConnector.java b/src/com/vaadin/terminal/gwt/client/ui/absolutelayout/AbsoluteLayoutConnector.java
index 2307f67ac5..80b6254e02 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/absolutelayout/AbsoluteLayoutConnector.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/absolutelayout/AbsoluteLayoutConnector.java
@@ -21,7 +21,7 @@ import com.vaadin.terminal.gwt.client.communication.StateChangeEvent;
 import com.vaadin.terminal.gwt.client.ui.AbstractComponentContainerConnector;
 import com.vaadin.terminal.gwt.client.ui.Connect;
 import com.vaadin.terminal.gwt.client.ui.LayoutClickEventHandler;
-import com.vaadin.terminal.gwt.client.ui.LayoutClickRPC;
+import com.vaadin.terminal.gwt.client.ui.LayoutClickRpc;
 import com.vaadin.terminal.gwt.client.ui.absolutelayout.VAbsoluteLayout.AbsoluteWrapper;
 import com.vaadin.ui.AbsoluteLayout;
 
@@ -38,20 +38,20 @@ public class AbsoluteLayoutConnector extends
         }
 
         @Override
-        protected LayoutClickRPC getLayoutClickRPC() {
+        protected LayoutClickRpc getLayoutClickRPC() {
             return rpc;
         };
 
     };
 
-    private AbsoluteLayoutServerRPC rpc;
+    private AbsoluteLayoutServerRpc rpc;
 
     private Map<String, AbsoluteWrapper> connectorIdToComponentWrapper = new HashMap<String, AbsoluteWrapper>();
 
     @Override
     protected void init() {
         super.init();
-        rpc = RpcProxy.create(AbsoluteLayoutServerRPC.class, this);
+        rpc = RpcProxy.create(AbsoluteLayoutServerRpc.class, this);
     }
 
     /**
diff --git a/src/com/vaadin/terminal/gwt/client/ui/absolutelayout/AbsoluteLayoutServerRPC.java b/src/com/vaadin/terminal/gwt/client/ui/absolutelayout/AbsoluteLayoutServerRpc.java
index df7ee1b82e..d626eb5b6c 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/absolutelayout/AbsoluteLayoutServerRPC.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/absolutelayout/AbsoluteLayoutServerRpc.java
@@ -4,8 +4,8 @@
 package com.vaadin.terminal.gwt.client.ui.absolutelayout;
 
 import com.vaadin.terminal.gwt.client.communication.ServerRpc;
-import com.vaadin.terminal.gwt.client.ui.LayoutClickRPC;
+import com.vaadin.terminal.gwt.client.ui.LayoutClickRpc;
 
-public interface AbsoluteLayoutServerRPC extends LayoutClickRPC, ServerRpc {
+public interface AbsoluteLayoutServerRpc extends LayoutClickRpc, ServerRpc {
 
 }
\ No newline at end of file
diff --git a/src/com/vaadin/terminal/gwt/client/ui/csslayout/CssLayoutConnector.java b/src/com/vaadin/terminal/gwt/client/ui/csslayout/CssLayoutConnector.java
index 76fb9ab926..7df31a8593 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/csslayout/CssLayoutConnector.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/csslayout/CssLayoutConnector.java
@@ -20,7 +20,7 @@ import com.vaadin.terminal.gwt.client.communication.StateChangeEvent;
 import com.vaadin.terminal.gwt.client.ui.AbstractLayoutConnector;
 import com.vaadin.terminal.gwt.client.ui.Connect;
 import com.vaadin.terminal.gwt.client.ui.LayoutClickEventHandler;
-import com.vaadin.terminal.gwt.client.ui.LayoutClickRPC;
+import com.vaadin.terminal.gwt.client.ui.LayoutClickRpc;
 import com.vaadin.terminal.gwt.client.ui.VMarginInfo;
 import com.vaadin.terminal.gwt.client.ui.csslayout.VCssLayout.FlowPane;
 import com.vaadin.ui.CssLayout;
@@ -38,19 +38,19 @@ public class CssLayoutConnector extends AbstractLayoutConnector {
         }
 
         @Override
-        protected LayoutClickRPC getLayoutClickRPC() {
+        protected LayoutClickRpc getLayoutClickRPC() {
             return rpc;
         };
     };
 
-    private CssLayoutServerRPC rpc;
+    private CssLayoutServerRpc rpc;
 
     private Map<ComponentConnector, VCaption> childToCaption = new HashMap<ComponentConnector, VCaption>();
 
     @Override
     protected void init() {
         super.init();
-        rpc = RpcProxy.create(CssLayoutServerRPC.class, this);
+        rpc = RpcProxy.create(CssLayoutServerRpc.class, this);
     }
 
     @Override
diff --git a/src/com/vaadin/terminal/gwt/client/ui/csslayout/CssLayoutServerRPC.java b/src/com/vaadin/terminal/gwt/client/ui/csslayout/CssLayoutServerRpc.java
index 067ea54fdc..7ba89d4c4c 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/csslayout/CssLayoutServerRPC.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/csslayout/CssLayoutServerRpc.java
@@ -4,8 +4,8 @@
 package com.vaadin.terminal.gwt.client.ui.csslayout;
 
 import com.vaadin.terminal.gwt.client.communication.ServerRpc;
-import com.vaadin.terminal.gwt.client.ui.LayoutClickRPC;
+import com.vaadin.terminal.gwt.client.ui.LayoutClickRpc;
 
-public interface CssLayoutServerRPC extends LayoutClickRPC, ServerRpc {
+public interface CssLayoutServerRpc extends LayoutClickRpc, ServerRpc {
 
 }
\ No newline at end of file
diff --git a/src/com/vaadin/terminal/gwt/client/ui/embedded/EmbeddedConnector.java b/src/com/vaadin/terminal/gwt/client/ui/embedded/EmbeddedConnector.java
index 423aac1974..81ac195c8e 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/embedded/EmbeddedConnector.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/embedded/EmbeddedConnector.java
@@ -35,12 +35,12 @@ public class EmbeddedConnector extends AbstractComponentConnector implements
 
     public static final String ALTERNATE_TEXT = "alt";
 
-    EmbeddedServerRPC rpc;
+    EmbeddedServerRpc rpc;
 
     @Override
     protected void init() {
         super.init();
-        rpc = RpcProxy.create(EmbeddedServerRPC.class, this);
+        rpc = RpcProxy.create(EmbeddedServerRpc.class, this);
     }
 
     public void updateFromUIDL(UIDL uidl, ApplicationConnection client) {
diff --git a/src/com/vaadin/terminal/gwt/client/ui/embedded/EmbeddedServerRPC.java b/src/com/vaadin/terminal/gwt/client/ui/embedded/EmbeddedServerRpc.java
index e3410e408e..7f36c812bc 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/embedded/EmbeddedServerRPC.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/embedded/EmbeddedServerRpc.java
@@ -4,7 +4,7 @@
 package com.vaadin.terminal.gwt.client.ui.embedded;
 
 import com.vaadin.terminal.gwt.client.communication.ServerRpc;
-import com.vaadin.terminal.gwt.client.ui.ClickRPC;
+import com.vaadin.terminal.gwt.client.ui.ClickRpc;
 
-public interface EmbeddedServerRPC extends ClickRPC, ServerRpc {
+public interface EmbeddedServerRpc extends ClickRpc, ServerRpc {
 }
\ No newline at end of file
diff --git a/src/com/vaadin/terminal/gwt/client/ui/gridlayout/GridLayoutConnector.java b/src/com/vaadin/terminal/gwt/client/ui/gridlayout/GridLayoutConnector.java
index 82f26383a1..e4a31b96ef 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/gridlayout/GridLayoutConnector.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/gridlayout/GridLayoutConnector.java
@@ -22,7 +22,7 @@ import com.vaadin.terminal.gwt.client.ui.AbstractComponentContainerConnector;
 import com.vaadin.terminal.gwt.client.ui.AlignmentInfo;
 import com.vaadin.terminal.gwt.client.ui.Connect;
 import com.vaadin.terminal.gwt.client.ui.LayoutClickEventHandler;
-import com.vaadin.terminal.gwt.client.ui.LayoutClickRPC;
+import com.vaadin.terminal.gwt.client.ui.LayoutClickRpc;
 import com.vaadin.terminal.gwt.client.ui.VMarginInfo;
 import com.vaadin.terminal.gwt.client.ui.gridlayout.VGridLayout.Cell;
 import com.vaadin.terminal.gwt.client.ui.layout.VLayoutSlot;
@@ -41,18 +41,18 @@ public class GridLayoutConnector extends AbstractComponentContainerConnector
         }
 
         @Override
-        protected LayoutClickRPC getLayoutClickRPC() {
+        protected LayoutClickRpc getLayoutClickRPC() {
             return rpc;
         };
 
     };
 
-    private GridLayoutServerRPC rpc;
+    private GridLayoutServerRpc rpc;
     private boolean needCaptionUpdate = false;
 
     @Override
     public void init() {
-        rpc = RpcProxy.create(GridLayoutServerRPC.class, this);
+        rpc = RpcProxy.create(GridLayoutServerRpc.class, this);
         getLayoutManager().registerDependency(this,
                 getWidget().spacingMeasureElement);
     }
diff --git a/src/com/vaadin/terminal/gwt/client/ui/gridlayout/GridLayoutServerRPC.java b/src/com/vaadin/terminal/gwt/client/ui/gridlayout/GridLayoutServerRpc.java
index 1b7f1a15d9..cd8df297ec 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/gridlayout/GridLayoutServerRPC.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/gridlayout/GridLayoutServerRpc.java
@@ -4,8 +4,8 @@
 package com.vaadin.terminal.gwt.client.ui.gridlayout;
 
 import com.vaadin.terminal.gwt.client.communication.ServerRpc;
-import com.vaadin.terminal.gwt.client.ui.LayoutClickRPC;
+import com.vaadin.terminal.gwt.client.ui.LayoutClickRpc;
 
-public interface GridLayoutServerRPC extends LayoutClickRPC, ServerRpc {
+public interface GridLayoutServerRpc extends LayoutClickRpc, ServerRpc {
 
 }
\ No newline at end of file
diff --git a/src/com/vaadin/terminal/gwt/client/ui/orderedlayout/AbstractOrderedLayoutConnector.java b/src/com/vaadin/terminal/gwt/client/ui/orderedlayout/AbstractOrderedLayoutConnector.java
index d36046d6cb..174da61bd3 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/orderedlayout/AbstractOrderedLayoutConnector.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/orderedlayout/AbstractOrderedLayoutConnector.java
@@ -23,7 +23,7 @@ import com.vaadin.terminal.gwt.client.communication.RpcProxy;
 import com.vaadin.terminal.gwt.client.ui.AbstractLayoutConnector;
 import com.vaadin.terminal.gwt.client.ui.AlignmentInfo;
 import com.vaadin.terminal.gwt.client.ui.LayoutClickEventHandler;
-import com.vaadin.terminal.gwt.client.ui.LayoutClickRPC;
+import com.vaadin.terminal.gwt.client.ui.LayoutClickRpc;
 import com.vaadin.terminal.gwt.client.ui.VMarginInfo;
 import com.vaadin.terminal.gwt.client.ui.layout.ComponentConnectorLayoutSlot;
 import com.vaadin.terminal.gwt.client.ui.layout.VLayoutSlot;
@@ -31,7 +31,7 @@ import com.vaadin.terminal.gwt.client.ui.layout.VLayoutSlot;
 public abstract class AbstractOrderedLayoutConnector extends
         AbstractLayoutConnector implements Paintable, DirectionalManagedLayout {
 
-    AbstractOrderedLayoutServerRPC rpc;
+    AbstractOrderedLayoutServerRpc rpc;
 
     private LayoutClickEventHandler clickEventHandler = new LayoutClickEventHandler(
             this) {
@@ -43,7 +43,7 @@ public abstract class AbstractOrderedLayoutConnector extends
         }
 
         @Override
-        protected LayoutClickRPC getLayoutClickRPC() {
+        protected LayoutClickRpc getLayoutClickRPC() {
             return rpc;
         };
 
@@ -51,7 +51,7 @@ public abstract class AbstractOrderedLayoutConnector extends
 
     @Override
     public void init() {
-        rpc = RpcProxy.create(AbstractOrderedLayoutServerRPC.class, this);
+        rpc = RpcProxy.create(AbstractOrderedLayoutServerRpc.class, this);
         getLayoutManager().registerDependency(this,
                 getWidget().spacingMeasureElement);
     }
diff --git a/src/com/vaadin/terminal/gwt/client/ui/orderedlayout/AbstractOrderedLayoutServerRPC.java b/src/com/vaadin/terminal/gwt/client/ui/orderedlayout/AbstractOrderedLayoutServerRpc.java
index f23cda3512..5a29eacada 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/orderedlayout/AbstractOrderedLayoutServerRPC.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/orderedlayout/AbstractOrderedLayoutServerRpc.java
@@ -4,9 +4,9 @@
 package com.vaadin.terminal.gwt.client.ui.orderedlayout;
 
 import com.vaadin.terminal.gwt.client.communication.ServerRpc;
-import com.vaadin.terminal.gwt.client.ui.LayoutClickRPC;
+import com.vaadin.terminal.gwt.client.ui.LayoutClickRpc;
 
-public interface AbstractOrderedLayoutServerRPC extends LayoutClickRPC,
+public interface AbstractOrderedLayoutServerRpc extends LayoutClickRpc,
         ServerRpc {
 
 }
\ No newline at end of file
diff --git a/src/com/vaadin/terminal/gwt/client/ui/panel/PanelConnector.java b/src/com/vaadin/terminal/gwt/client/ui/panel/PanelConnector.java
index a8512762f1..9555c38a36 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/panel/PanelConnector.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/panel/PanelConnector.java
@@ -43,11 +43,11 @@ public class PanelConnector extends AbstractComponentContainerConnector
 
     private Integer uidlScrollLeft;
 
-    private PanelServerRPC rpc;
+    private PanelServerRpc rpc;
 
     @Override
     public void init() {
-        rpc = RpcProxy.create(PanelServerRPC.class, this);
+        rpc = RpcProxy.create(PanelServerRpc.class, this);
         VPanel panel = getWidget();
         LayoutManager layoutManager = getLayoutManager();
 
diff --git a/src/com/vaadin/terminal/gwt/client/ui/panel/PanelServerRPC.java b/src/com/vaadin/terminal/gwt/client/ui/panel/PanelServerRpc.java
index 9a556cfe0e..9b59344aec 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/panel/PanelServerRPC.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/panel/PanelServerRpc.java
@@ -4,8 +4,8 @@
 package com.vaadin.terminal.gwt.client.ui.panel;
 
 import com.vaadin.terminal.gwt.client.communication.ServerRpc;
-import com.vaadin.terminal.gwt.client.ui.ClickRPC;
+import com.vaadin.terminal.gwt.client.ui.ClickRpc;
 
-public interface PanelServerRPC extends ClickRPC, ServerRpc {
+public interface PanelServerRpc extends ClickRpc, ServerRpc {
 
 }
\ No newline at end of file
diff --git a/src/com/vaadin/terminal/gwt/client/ui/root/RootConnector.java b/src/com/vaadin/terminal/gwt/client/ui/root/RootConnector.java
index 408c15383c..46f82d60b7 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/root/RootConnector.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/root/RootConnector.java
@@ -47,7 +47,7 @@ import com.vaadin.ui.Root;
 public class RootConnector extends AbstractComponentContainerConnector
         implements Paintable, MayScrollChildren {
 
-    private RootServerRPC rpc = RpcProxy.create(RootServerRPC.class, this);
+    private RootServerRpc rpc = RpcProxy.create(RootServerRpc.class, this);
 
     private HandlerRegistration childStateChangeHandlerRegistration;
 
diff --git a/src/com/vaadin/terminal/gwt/client/ui/root/RootServerRPC.java b/src/com/vaadin/terminal/gwt/client/ui/root/RootServerRpc.java
index f32b972dfe..389500949d 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/root/RootServerRPC.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/root/RootServerRpc.java
@@ -4,8 +4,8 @@
 package com.vaadin.terminal.gwt.client.ui.root;
 
 import com.vaadin.terminal.gwt.client.communication.ServerRpc;
-import com.vaadin.terminal.gwt.client.ui.ClickRPC;
+import com.vaadin.terminal.gwt.client.ui.ClickRpc;
 
-public interface RootServerRPC extends ClickRPC, ServerRpc {
+public interface RootServerRpc extends ClickRpc, ServerRpc {
 
 }
\ No newline at end of file
diff --git a/src/com/vaadin/terminal/gwt/client/ui/splitpanel/AbstractSplitPanelConnector.java b/src/com/vaadin/terminal/gwt/client/ui/splitpanel/AbstractSplitPanelConnector.java
index 7340c2cbd9..b3921204dc 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/splitpanel/AbstractSplitPanelConnector.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/splitpanel/AbstractSplitPanelConnector.java
@@ -30,12 +30,12 @@ import com.vaadin.terminal.gwt.client.ui.splitpanel.VAbstractSplitPanel.Splitter
 public abstract class AbstractSplitPanelConnector extends
         AbstractComponentContainerConnector implements SimpleManagedLayout {
 
-    private AbstractSplitPanelRPC rpc;
+    private AbstractSplitPanelRpc rpc;
 
     @Override
     protected void init() {
         super.init();
-        rpc = RpcProxy.create(AbstractSplitPanelRPC.class, this);
+        rpc = RpcProxy.create(AbstractSplitPanelRpc.class, this);
         // TODO Remove
         getWidget().client = getConnection();
 
diff --git a/src/com/vaadin/terminal/gwt/client/ui/splitpanel/AbstractSplitPanelRPC.java b/src/com/vaadin/terminal/gwt/client/ui/splitpanel/AbstractSplitPanelRpc.java
index 15cd47a656..cc043838ff 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/splitpanel/AbstractSplitPanelRPC.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/splitpanel/AbstractSplitPanelRpc.java
@@ -6,7 +6,7 @@ package com.vaadin.terminal.gwt.client.ui.splitpanel;
 import com.vaadin.terminal.gwt.client.MouseEventDetails;
 import com.vaadin.terminal.gwt.client.communication.ServerRpc;
 
-public interface AbstractSplitPanelRPC extends ServerRpc {
+public interface AbstractSplitPanelRpc extends ServerRpc {
 
     /**
      * Called when the position has been updated by the user.
diff --git a/src/com/vaadin/terminal/gwt/client/ui/window/WindowConnector.java b/src/com/vaadin/terminal/gwt/client/ui/window/WindowConnector.java
index 85f4213d3e..6979982a9c 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/window/WindowConnector.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/window/WindowConnector.java
@@ -44,7 +44,7 @@ public class WindowConnector extends AbstractComponentContainerConnector
         }
     };
 
-    private WindowServerRPC rpc;
+    private WindowServerRpc rpc;
 
     boolean minWidthChecked = false;
 
@@ -56,7 +56,7 @@ public class WindowConnector extends AbstractComponentContainerConnector
     @Override
     protected void init() {
         super.init();
-        rpc = RpcProxy.create(WindowServerRPC.class, this);
+        rpc = RpcProxy.create(WindowServerRpc.class, this);
 
         getLayoutManager().registerDependency(this,
                 getWidget().contentPanel.getElement());
diff --git a/src/com/vaadin/terminal/gwt/client/ui/window/WindowServerRPC.java b/src/com/vaadin/terminal/gwt/client/ui/window/WindowServerRpc.java
index 782284b562..4723c55786 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/window/WindowServerRPC.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/window/WindowServerRpc.java
@@ -4,7 +4,7 @@
 package com.vaadin.terminal.gwt.client.ui.window;
 
 import com.vaadin.terminal.gwt.client.communication.ServerRpc;
-import com.vaadin.terminal.gwt.client.ui.ClickRPC;
+import com.vaadin.terminal.gwt.client.ui.ClickRpc;
 
-public interface WindowServerRPC extends ClickRPC, ServerRpc {
+public interface WindowServerRpc extends ClickRpc, ServerRpc {
 }
\ No newline at end of file
diff --git a/src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java b/src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java
index 46d519c240..56e99450d2 100644
--- a/src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java
+++ b/src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java
@@ -1453,9 +1453,9 @@ public abstract class AbstractCommunicationManager implements Serializable {
                     continue;
                 }
 
-                if (invocation instanceof ServerRPCMethodInvocation) {
+                if (invocation instanceof ServerRpcMethodInvocation) {
                     ServerRpcManager.applyInvocation(connector,
-                            (ServerRPCMethodInvocation) invocation);
+                            (ServerRpcMethodInvocation) invocation);
                 } else {
 
                     // All code below is for legacy variable changes
@@ -1575,10 +1575,10 @@ public abstract class AbstractCommunicationManager implements Serializable {
         }
     }
 
-    private ServerRPCMethodInvocation parseServerRpcInvocation(
+    private ServerRpcMethodInvocation parseServerRpcInvocation(
             String connectorId, String interfaceName, String methodName,
             JSONArray parametersJson) throws JSONException {
-        ServerRPCMethodInvocation invocation = new ServerRPCMethodInvocation(
+        ServerRpcMethodInvocation invocation = new ServerRpcMethodInvocation(
                 connectorId, interfaceName, methodName, parametersJson.length());
 
         Object[] parameters = new Object[parametersJson.length()];
diff --git a/src/com/vaadin/terminal/gwt/server/RpcManager.java b/src/com/vaadin/terminal/gwt/server/RpcManager.java
index a629447069..d240ab8467 100644
--- a/src/com/vaadin/terminal/gwt/server/RpcManager.java
+++ b/src/com/vaadin/terminal/gwt/server/RpcManager.java
@@ -13,5 +13,5 @@ import java.io.Serializable;
  * @since 7.0
  */
 public interface RpcManager extends Serializable {
-    public void applyInvocation(ServerRPCMethodInvocation invocation);
+    public void applyInvocation(ServerRpcMethodInvocation invocation);
 }
diff --git a/src/com/vaadin/terminal/gwt/server/ServerRpcManager.java b/src/com/vaadin/terminal/gwt/server/ServerRpcManager.java
index 025af7d61d..07f83864c2 100644
--- a/src/com/vaadin/terminal/gwt/server/ServerRpcManager.java
+++ b/src/com/vaadin/terminal/gwt/server/ServerRpcManager.java
@@ -68,7 +68,7 @@ public class ServerRpcManager<T> implements RpcManager {
      *            method invocation to perform
      */
     public static void applyInvocation(RpcTarget target,
-            ServerRPCMethodInvocation invocation) {
+            ServerRpcMethodInvocation invocation) {
         RpcManager manager = target.getRpcManager(invocation
                 .getInterfaceClass());
         if (manager != null) {
@@ -109,7 +109,7 @@ public class ServerRpcManager<T> implements RpcManager {
      * @param invocation
      *            method invocation to perform
      */
-    public void applyInvocation(ServerRPCMethodInvocation invocation) {
+    public void applyInvocation(ServerRpcMethodInvocation invocation) {
         Method method = invocation.getMethod();
         Class<?>[] parameterTypes = method.getParameterTypes();
         Object[] args = new Object[parameterTypes.length];
diff --git a/src/com/vaadin/terminal/gwt/server/ServerRPCMethodInvocation.java b/src/com/vaadin/terminal/gwt/server/ServerRpcMethodInvocation.java
index 6afb549502..6f278f7797 100644
--- a/src/com/vaadin/terminal/gwt/server/ServerRPCMethodInvocation.java
+++ b/src/com/vaadin/terminal/gwt/server/ServerRpcMethodInvocation.java
@@ -10,7 +10,7 @@ import java.util.concurrent.ConcurrentHashMap;
 import com.vaadin.terminal.gwt.client.communication.MethodInvocation;
 import com.vaadin.terminal.gwt.client.communication.ServerRpc;
 
-public class ServerRPCMethodInvocation extends MethodInvocation {
+public class ServerRpcMethodInvocation extends MethodInvocation {
 
     private static final Map<String, Method> invocationMethodCache = new ConcurrentHashMap<String, Method>(
             128, 0.75f, 1);
@@ -19,7 +19,7 @@ public class ServerRPCMethodInvocation extends MethodInvocation {
 
     private Class<? extends ServerRpc> interfaceClass;
 
-    public ServerRPCMethodInvocation(String connectorId, String interfaceName,
+    public ServerRpcMethodInvocation(String connectorId, String interfaceName,
             String methodName, int parameterCount) {
         super(connectorId, interfaceName, methodName);
 
diff --git a/src/com/vaadin/ui/AbsoluteLayout.java b/src/com/vaadin/ui/AbsoluteLayout.java
index e548798abe..9ba005f75a 100644
--- a/src/com/vaadin/ui/AbsoluteLayout.java
+++ b/src/com/vaadin/ui/AbsoluteLayout.java
@@ -16,7 +16,7 @@ import com.vaadin.terminal.Sizeable;
 import com.vaadin.terminal.gwt.client.Connector;
 import com.vaadin.terminal.gwt.client.MouseEventDetails;
 import com.vaadin.terminal.gwt.client.ui.LayoutClickEventHandler;
-import com.vaadin.terminal.gwt.client.ui.absolutelayout.AbsoluteLayoutServerRPC;
+import com.vaadin.terminal.gwt.client.ui.absolutelayout.AbsoluteLayoutServerRpc;
 import com.vaadin.terminal.gwt.client.ui.absolutelayout.AbsoluteLayoutState;
 
 /**
@@ -28,7 +28,7 @@ import com.vaadin.terminal.gwt.client.ui.absolutelayout.AbsoluteLayoutState;
 public class AbsoluteLayout extends AbstractLayout implements
         LayoutClickNotifier {
 
-    private AbsoluteLayoutServerRPC rpc = new AbsoluteLayoutServerRPC() {
+    private AbsoluteLayoutServerRpc rpc = new AbsoluteLayoutServerRpc() {
 
         public void layoutClick(MouseEventDetails mouseDetails,
                 Connector clickedConnector) {
diff --git a/src/com/vaadin/ui/AbstractOrderedLayout.java b/src/com/vaadin/ui/AbstractOrderedLayout.java
index 0f2f670331..3606fa6572 100644
--- a/src/com/vaadin/ui/AbstractOrderedLayout.java
+++ b/src/com/vaadin/ui/AbstractOrderedLayout.java
@@ -19,7 +19,7 @@ import com.vaadin.terminal.Vaadin6Component;
 import com.vaadin.terminal.gwt.client.Connector;
 import com.vaadin.terminal.gwt.client.MouseEventDetails;
 import com.vaadin.terminal.gwt.client.ui.LayoutClickEventHandler;
-import com.vaadin.terminal.gwt.client.ui.orderedlayout.AbstractOrderedLayoutServerRPC;
+import com.vaadin.terminal.gwt.client.ui.orderedlayout.AbstractOrderedLayoutServerRpc;
 import com.vaadin.terminal.gwt.client.ui.orderedlayout.AbstractOrderedLayoutState;
 
 @SuppressWarnings("serial")
@@ -27,7 +27,7 @@ public abstract class AbstractOrderedLayout extends AbstractLayout implements
         Layout.AlignmentHandler, Layout.SpacingHandler, LayoutClickNotifier,
         Vaadin6Component {
 
-    private AbstractOrderedLayoutServerRPC rpc = new AbstractOrderedLayoutServerRPC() {
+    private AbstractOrderedLayoutServerRpc rpc = new AbstractOrderedLayoutServerRpc() {
 
         public void layoutClick(MouseEventDetails mouseDetails,
                 Connector clickedConnector) {
diff --git a/src/com/vaadin/ui/AbstractSplitPanel.java b/src/com/vaadin/ui/AbstractSplitPanel.java
index 5eb46b85a9..aaf06e79be 100644
--- a/src/com/vaadin/ui/AbstractSplitPanel.java
+++ b/src/com/vaadin/ui/AbstractSplitPanel.java
@@ -13,7 +13,7 @@ import com.vaadin.event.MouseEvents.ClickEvent;
 import com.vaadin.terminal.Sizeable;
 import com.vaadin.terminal.gwt.client.MouseEventDetails;
 import com.vaadin.terminal.gwt.client.ui.ClickEventHandler;
-import com.vaadin.terminal.gwt.client.ui.splitpanel.AbstractSplitPanelRPC;
+import com.vaadin.terminal.gwt.client.ui.splitpanel.AbstractSplitPanelRpc;
 import com.vaadin.terminal.gwt.client.ui.splitpanel.AbstractSplitPanelState;
 import com.vaadin.terminal.gwt.client.ui.splitpanel.AbstractSplitPanelState.SplitterState;
 import com.vaadin.tools.ReflectTools;
@@ -33,7 +33,7 @@ public abstract class AbstractSplitPanel extends AbstractComponentContainer {
 
     private Unit posUnit;
 
-    private AbstractSplitPanelRPC rpc = new AbstractSplitPanelRPC() {
+    private AbstractSplitPanelRpc rpc = new AbstractSplitPanelRpc() {
 
         public void splitterClick(MouseEventDetails mouseDetails) {
             fireEvent(new SplitterClickEvent(AbstractSplitPanel.this,
diff --git a/src/com/vaadin/ui/CssLayout.java b/src/com/vaadin/ui/CssLayout.java
index ac4f4b31a9..0a2656af31 100644
--- a/src/com/vaadin/ui/CssLayout.java
+++ b/src/com/vaadin/ui/CssLayout.java
@@ -11,7 +11,7 @@ import com.vaadin.event.LayoutEvents.LayoutClickListener;
 import com.vaadin.event.LayoutEvents.LayoutClickNotifier;
 import com.vaadin.terminal.gwt.client.Connector;
 import com.vaadin.terminal.gwt.client.MouseEventDetails;
-import com.vaadin.terminal.gwt.client.ui.csslayout.CssLayoutServerRPC;
+import com.vaadin.terminal.gwt.client.ui.csslayout.CssLayoutServerRpc;
 import com.vaadin.terminal.gwt.client.ui.csslayout.CssLayoutState;
 import com.vaadin.terminal.gwt.client.ui.LayoutClickEventHandler;
 
@@ -58,7 +58,7 @@ import com.vaadin.terminal.gwt.client.ui.LayoutClickEventHandler;
  */
 public class CssLayout extends AbstractLayout implements LayoutClickNotifier {
 
-    private CssLayoutServerRPC rpc = new CssLayoutServerRPC() {
+    private CssLayoutServerRpc rpc = new CssLayoutServerRpc() {
 
         public void layoutClick(MouseEventDetails mouseDetails,
                 Connector clickedConnector) {
diff --git a/src/com/vaadin/ui/Embedded.java b/src/com/vaadin/ui/Embedded.java
index 052436cef7..1bcd984666 100644
--- a/src/com/vaadin/ui/Embedded.java
+++ b/src/com/vaadin/ui/Embedded.java
@@ -17,7 +17,7 @@ import com.vaadin.terminal.Vaadin6Component;
 import com.vaadin.terminal.gwt.client.MouseEventDetails;
 import com.vaadin.terminal.gwt.client.ui.ClickEventHandler;
 import com.vaadin.terminal.gwt.client.ui.embedded.EmbeddedConnector;
-import com.vaadin.terminal.gwt.client.ui.embedded.EmbeddedServerRPC;
+import com.vaadin.terminal.gwt.client.ui.embedded.EmbeddedServerRpc;
 
 /**
  * Component for embedding external objects.
@@ -80,7 +80,7 @@ public class Embedded extends AbstractComponent implements Vaadin6Component {
 
     private String altText;
 
-    private EmbeddedServerRPC rpc = new EmbeddedServerRPC() {
+    private EmbeddedServerRpc rpc = new EmbeddedServerRpc() {
         public void click(MouseEventDetails mouseDetails) {
             fireEvent(new ClickEvent(Embedded.this, mouseDetails));
         }
diff --git a/src/com/vaadin/ui/GridLayout.java b/src/com/vaadin/ui/GridLayout.java
index 689cdcf28e..0ab729ce5c 100644
--- a/src/com/vaadin/ui/GridLayout.java
+++ b/src/com/vaadin/ui/GridLayout.java
@@ -22,7 +22,7 @@ import com.vaadin.terminal.Vaadin6Component;
 import com.vaadin.terminal.gwt.client.Connector;
 import com.vaadin.terminal.gwt.client.MouseEventDetails;
 import com.vaadin.terminal.gwt.client.ui.LayoutClickEventHandler;
-import com.vaadin.terminal.gwt.client.ui.gridlayout.GridLayoutServerRPC;
+import com.vaadin.terminal.gwt.client.ui.gridlayout.GridLayoutServerRpc;
 import com.vaadin.terminal.gwt.client.ui.gridlayout.GridLayoutState;
 
 /**
@@ -56,7 +56,7 @@ public class GridLayout extends AbstractLayout implements
         Layout.AlignmentHandler, Layout.SpacingHandler, LayoutClickNotifier,
         Vaadin6Component {
 
-    private GridLayoutServerRPC rpc = new GridLayoutServerRPC() {
+    private GridLayoutServerRpc rpc = new GridLayoutServerRpc() {
 
         public void layoutClick(MouseEventDetails mouseDetails,
                 Connector clickedConnector) {
diff --git a/src/com/vaadin/ui/Panel.java b/src/com/vaadin/ui/Panel.java
index e358462bbb..b2916f78c7 100644
--- a/src/com/vaadin/ui/Panel.java
+++ b/src/com/vaadin/ui/Panel.java
@@ -18,7 +18,7 @@ import com.vaadin.terminal.Scrollable;
 import com.vaadin.terminal.Vaadin6Component;
 import com.vaadin.terminal.gwt.client.MouseEventDetails;
 import com.vaadin.terminal.gwt.client.ui.ClickEventHandler;
-import com.vaadin.terminal.gwt.client.ui.panel.PanelServerRPC;
+import com.vaadin.terminal.gwt.client.ui.panel.PanelServerRpc;
 import com.vaadin.terminal.gwt.client.ui.panel.PanelState;
 import com.vaadin.ui.Component.Focusable;
 
@@ -47,7 +47,7 @@ public class Panel extends AbstractComponentContainer implements Scrollable,
      */
     protected ActionManager actionManager;
 
-    private PanelServerRPC rpc = new PanelServerRPC() {
+    private PanelServerRpc rpc = new PanelServerRpc() {
         public void click(MouseEventDetails mouseDetails) {
             fireEvent(new ClickEvent(Panel.this, mouseDetails));
         }
diff --git a/src/com/vaadin/ui/Root.java b/src/com/vaadin/ui/Root.java
index 541127e092..405ae8da93 100644
--- a/src/com/vaadin/ui/Root.java
+++ b/src/com/vaadin/ui/Root.java
@@ -33,7 +33,7 @@ import com.vaadin.terminal.WrappedRequest.BrowserDetails;
 import com.vaadin.terminal.gwt.client.ComponentState;
 import com.vaadin.terminal.gwt.client.MouseEventDetails;
 import com.vaadin.terminal.gwt.client.ui.notification.VNotification;
-import com.vaadin.terminal.gwt.client.ui.root.RootServerRPC;
+import com.vaadin.terminal.gwt.client.ui.root.RootServerRpc;
 import com.vaadin.terminal.gwt.client.ui.root.RootState;
 import com.vaadin.terminal.gwt.client.ui.root.VRoot;
 import com.vaadin.tools.ReflectTools;
@@ -409,7 +409,7 @@ public abstract class Root extends AbstractComponentContainer implements
     private DirtyConnectorTracker dirtyConnectorTracker = new DirtyConnectorTracker(
             this);
 
-    private RootServerRPC rpc = new RootServerRPC() {
+    private RootServerRpc rpc = new RootServerRpc() {
         public void click(MouseEventDetails mouseDetails) {
             fireEvent(new ClickEvent(Root.this, mouseDetails));
         }
diff --git a/src/com/vaadin/ui/Window.java b/src/com/vaadin/ui/Window.java
index 6c3d75a920..3c17baf414 100644
--- a/src/com/vaadin/ui/Window.java
+++ b/src/com/vaadin/ui/Window.java
@@ -24,7 +24,7 @@ import com.vaadin.terminal.PaintException;
 import com.vaadin.terminal.PaintTarget;
 import com.vaadin.terminal.Vaadin6Component;
 import com.vaadin.terminal.gwt.client.MouseEventDetails;
-import com.vaadin.terminal.gwt.client.ui.window.WindowServerRPC;
+import com.vaadin.terminal.gwt.client.ui.window.WindowServerRpc;
 import com.vaadin.terminal.gwt.client.ui.window.WindowState;
 
 /**
@@ -76,7 +76,7 @@ import com.vaadin.terminal.gwt.client.ui.window.WindowState;
 public class Window extends Panel implements FocusNotifier, BlurNotifier,
         Vaadin6Component {
 
-    private WindowServerRPC rpc = new WindowServerRPC() {
+    private WindowServerRpc rpc = new WindowServerRpc() {
 
         public void click(MouseEventDetails mouseDetails) {
             fireEvent(new ClickEvent(Window.this, mouseDetails));