diff --git a/adapter/src/main/java/com/iluwatar/App.java b/adapter/src/main/java/com/iluwatar/App.java
index 03ee1be47..0fe30f455 100644
--- a/adapter/src/main/java/com/iluwatar/App.java
+++ b/adapter/src/main/java/com/iluwatar/App.java
@@ -2,7 +2,7 @@ package com.iluwatar;
 
 /**
  * 
- * Adapter (GnomeEngineerAdapter) converts the interface of the
+ * Adapter (GnomeEngineer) converts the interface of the
  * target class (GoblinGlider) into suitable one.
  *
  */
@@ -10,7 +10,7 @@ public class App
 {
     public static void main( String[] args )
     {
-    	GnomeEngineerAdapter engineer = new GnomeEngineerAdapter();
-    	engineer.flyGoblinGlider();
+    	GnomeEngineer engineer = new GnomeEngineer();
+    	engineer.operateDevice();
     }
 }
diff --git a/adapter/src/main/java/com/iluwatar/Engineer.java b/adapter/src/main/java/com/iluwatar/Engineer.java
new file mode 100644
index 000000000..4bce0e7d3
--- /dev/null
+++ b/adapter/src/main/java/com/iluwatar/Engineer.java
@@ -0,0 +1,13 @@
+package com.iluwatar;
+
+/**
+ * 
+ * The interface the client knows how
+ * to use.
+ *
+ */
+public interface Engineer {
+
+	void operateDevice();
+	
+}
diff --git a/adapter/src/main/java/com/iluwatar/GnomeEngineer.java b/adapter/src/main/java/com/iluwatar/GnomeEngineer.java
new file mode 100644
index 000000000..a35a85e41
--- /dev/null
+++ b/adapter/src/main/java/com/iluwatar/GnomeEngineer.java
@@ -0,0 +1,25 @@
+package com.iluwatar;
+
+/**
+ * 
+ * Adapter class. Adapts the interface of the
+ * GoblinGlider into Engineer expected by the
+ * client.
+ *
+ */
+public class GnomeEngineer implements Engineer {
+
+	private GoblinGlider glider;
+	
+	public GnomeEngineer() {
+		glider = new GoblinGlider();
+	}
+
+	@Override
+	public void operateDevice() {
+		glider.attachGlider();
+		glider.gainSpeed();
+		glider.takeOff();
+	}
+	
+}
diff --git a/adapter/src/main/java/com/iluwatar/GnomeEngineerAdapter.java b/adapter/src/main/java/com/iluwatar/GnomeEngineerAdapter.java
deleted file mode 100644
index a502a8fc5..000000000
--- a/adapter/src/main/java/com/iluwatar/GnomeEngineerAdapter.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.iluwatar;
-
-/**
- * 
- * Adapter class.
- *
- */
-public class GnomeEngineerAdapter {
-
-	private GoblinGlider glider;
-	
-	public GnomeEngineerAdapter() {
-		glider = new GoblinGlider();
-	}
-	
-	public void flyGoblinGlider() {
-		glider.attachGlider();
-		glider.gainSpeed();
-		glider.takeOff();
-	}
-	
-}