1 files changed, 2 insertions, 2 deletions
diff --git a/shared/src/com/vaadin/shared/ui/ui/UIState.java b/shared/src/com/vaadin/shared/ui/ui/UIState.java
index 589744a48c..9e9f179f0b 100644
--- a/shared/src/com/vaadin/shared/ui/ui/UIState.java
+++ b/shared/src/com/vaadin/shared/ui/ui/UIState.java
@@ -21,7 +21,7 @@ import com.vaadin.shared.communication.PushMode;
 import com.vaadin.shared.ui.TabIndexState;
 
 public class UIState extends TabIndexState {
-    public TooltipConfiguration tooltipConfiguration = new TooltipConfiguration();
+    public TooltipConfigurationState tooltipConfiguration = new TooltipConfigurationState();
     public LoadingIndicatorConfiguration loadingIndicatorConfiguration = new LoadingIndicatorConfiguration();
     public int pollInterval = -1;
 
@@ -33,7 +33,7 @@ public class UIState extends TabIndexState {
         public int waitStateDelay = 5000;
     }
 
-    public static class TooltipConfiguration implements Serializable {
+    public static class TooltipConfigurationState implements Serializable {
         public int openDelay = 750;
         public int quickOpenDelay = 100;
         public int quickOpenTimeout = 1000;