diff --git a/ws/eclipse/HibIntro/src/main/java/inherit/v3/RetrieveAll.java b/ws/eclipse/HibIntro/src/main/java/inherit/v3/RetrieveAll.java
index a8eb7913bc9ddb96c80c555e5f373f3d67cb7e33..bd7468f30f500584a67feb53c40f7addbbdaa9aa 100644
--- a/ws/eclipse/HibIntro/src/main/java/inherit/v3/RetrieveAll.java
+++ b/ws/eclipse/HibIntro/src/main/java/inherit/v3/RetrieveAll.java
@@ -26,10 +26,10 @@ public class RetrieveAll {
 
     final Transaction transaction = session.beginTransaction();
 
-    final Query searchUsers = session.createQuery("from inherit.v3.Figure");
+    final Query searchFigures = session.createQuery("from inherit.v3.Figure");
     @SuppressWarnings("unchecked")
-    final List<Figure> billingDetailsList = (List<Figure>) searchUsers.list();
-    for (final Figure c: billingDetailsList) {
+    final List<Figure> figureList = (List<Figure>) searchFigures.list();
+    for (final Figure c: figureList) {
       System.out.println(c);
     }
     transaction.commit();
diff --git a/ws/eclipse/HibIntro/src/main/java/inherit/v3/RetrieveRectangles.java b/ws/eclipse/HibIntro/src/main/java/inherit/v3/RetrieveRectangles.java
index 685a42d98145262fa4d39393ec9d462d9ad996d5..ecce67be4afb61a38575e73f65280c1a5dc137c1 100644
--- a/ws/eclipse/HibIntro/src/main/java/inherit/v3/RetrieveRectangles.java
+++ b/ws/eclipse/HibIntro/src/main/java/inherit/v3/RetrieveRectangles.java
@@ -26,9 +26,9 @@ public class RetrieveRectangles {
 
     final Transaction transaction = session.beginTransaction();
 
-    final Query searchUsers = session.createQuery("from inherit.v3.Rectangle");
+    final Query searchRectangles = session.createQuery("from inherit.v3.Rectangle");
     @SuppressWarnings("unchecked")
-    final List<Rectangle> rectangleList = (List<Rectangle>) searchUsers.list();
+    final List<Rectangle> rectangleList = (List<Rectangle>) searchRectangles.list();
     for (final Rectangle r: rectangleList) {
       System.out.println(r);
     }