Improve naming of fields and variables (#10242)

* Variable names to conform to naming convention.

* Use static constants where it makes sense

2 files changed, 4 insertions, 4 deletions

diff --git a/server/src/main/java/com/vaadin/event/dd/acceptcriteria/AcceptAll.java b/server/src/main/java/com/vaadin/event/dd/acceptcriteria/AcceptAll.java
index 6dfca521a4..d7684b0142 100644
--- a/server/src/main/java/com/vaadin/event/dd/acceptcriteria/AcceptAll.java
+++ b/server/src/main/java/com/vaadin/event/dd/acceptcriteria/AcceptAll.java
@@ -29,13 +29,13 @@ import com.vaadin.event.dd.DragAndDropEvent;
 public final class AcceptAll extends ClientSideCriterion {
 
     private static final long serialVersionUID = 7406683402153141461L;
-    private static final AcceptCriterion singleton = new AcceptAll();
+    private static final AcceptCriterion SINGLETON = new AcceptAll();
 
     private AcceptAll() {
     }
 
     public static AcceptCriterion get() {
-        return singleton;
+        return SINGLETON;
     }
 
     @Override
diff --git a/server/src/main/java/com/vaadin/event/dd/acceptcriteria/SourceIsTarget.java b/server/src/main/java/com/vaadin/event/dd/acceptcriteria/SourceIsTarget.java
index 8c4b82c0c7..292ac636a7 100644
--- a/server/src/main/java/com/vaadin/event/dd/acceptcriteria/SourceIsTarget.java
+++ b/server/src/main/java/com/vaadin/event/dd/acceptcriteria/SourceIsTarget.java
@@ -35,7 +35,7 @@ import com.vaadin.ui.Component;
 public class SourceIsTarget extends ClientSideCriterion {
 
     private static final long serialVersionUID = -451399314705532584L;
-    private static final SourceIsTarget instance = new SourceIsTarget();
+    private static final SourceIsTarget INSTANCE = new SourceIsTarget();
 
     private SourceIsTarget() {
     }
@@ -52,7 +52,7 @@ public class SourceIsTarget extends ClientSideCriterion {
     }
 
     public static synchronized SourceIsTarget get() {
-        return instance;
+        return INSTANCE;
     }
 
 }