diff --git a/pom.xml b/pom.xml
index febe178..65ddd18 100644
--- a/pom.xml
+++ b/pom.xml
@@ -42,6 +42,11 @@
       <artifactId>client-runtime</artifactId>
       <version>1.6.15</version>
     </dependency>
+    <dependency>
+      <groupId>com.microsoft.azure</groupId>
+      <artifactId>azure</artifactId>
+      <version>1.32.1</version>
+    </dependency>
     <dependency>
       <groupId>io.reactivex</groupId>
       <artifactId>rxjava</artifactId>
diff --git a/samples/java/com/microsoft/bing/samples/BingAutosuggestV7.java b/samples/java/com/microsoft/bing/samples/BingAutosuggest.java
similarity index 100%
rename from samples/java/com/microsoft/bing/samples/BingAutosuggestV7.java
rename to samples/java/com/microsoft/bing/samples/BingAutosuggest.java
diff --git a/samples/java/com/microsoft/bing/samples/BingCustomSearchV7.java b/samples/java/com/microsoft/bing/samples/BingCustomSearch.java
similarity index 100%
rename from samples/java/com/microsoft/bing/samples/BingCustomSearchV7.java
rename to samples/java/com/microsoft/bing/samples/BingCustomSearch.java
diff --git a/samples/java/com/microsoft/bing/samples/BingEntitySearchV7.java b/samples/java/com/microsoft/bing/samples/BingEntitySearch.java
similarity index 100%
rename from samples/java/com/microsoft/bing/samples/BingEntitySearchV7.java
rename to samples/java/com/microsoft/bing/samples/BingEntitySearch.java
diff --git a/samples/java/com/microsoft/bing/samples/BingImageSearchV7.java b/samples/java/com/microsoft/bing/samples/BingImageSearch.java
similarity index 100%
rename from samples/java/com/microsoft/bing/samples/BingImageSearchV7.java
rename to samples/java/com/microsoft/bing/samples/BingImageSearch.java
diff --git a/samples/java/com/microsoft/bing/samples/BingImageSearchV7Quickstart.java b/samples/java/com/microsoft/bing/samples/BingImageSearchV7Quickstart.java
index 10726c2..e30f2ba 100644
--- a/samples/java/com/microsoft/bing/samples/BingImageSearchV7Quickstart.java
+++ b/samples/java/com/microsoft/bing/samples/BingImageSearchV7Quickstart.java
@@ -117,13 +117,4 @@ public class BingImageSearchv7Quickstart {
         }
     }
 }
-
-// Container class for search results encapsulates relevant headers and JSON data
-class SearchResults{
-    HashMap<String, String> relevantHeaders;
-    String jsonResponse;
-    SearchResults(HashMap<String, String> headers, String json) {
-        relevantHeaders = headers;
-        jsonResponse = json;
-    }
 }
\ No newline at end of file
diff --git a/samples/java/com/microsoft/bing/samples/BingNewsSearchV7.java b/samples/java/com/microsoft/bing/samples/BingNewsSearch.java
similarity index 100%
rename from samples/java/com/microsoft/bing/samples/BingNewsSearchV7.java
rename to samples/java/com/microsoft/bing/samples/BingNewsSearch.java
diff --git a/samples/java/com/microsoft/bing/samples/BingSpellCheckV7.java b/samples/java/com/microsoft/bing/samples/BingSpellCheck.java
similarity index 100%
rename from samples/java/com/microsoft/bing/samples/BingSpellCheckV7.java
rename to samples/java/com/microsoft/bing/samples/BingSpellCheck.java
diff --git a/samples/java/com/microsoft/bing/samples/BingVideoSearchV7.java b/samples/java/com/microsoft/bing/samples/BingVideoSearch.java
similarity index 100%
rename from samples/java/com/microsoft/bing/samples/BingVideoSearchV7.java
rename to samples/java/com/microsoft/bing/samples/BingVideoSearch.java
diff --git a/samples/java/com/microsoft/bing/samples/BingVisualSearchV7.java b/samples/java/com/microsoft/bing/samples/BingVisualSearch.java
similarity index 100%
rename from samples/java/com/microsoft/bing/samples/BingVisualSearchV7.java
rename to samples/java/com/microsoft/bing/samples/BingVisualSearch.java
diff --git a/samples/java/com/microsoft/bing/samples/BingWebSearchV7.java b/samples/java/com/microsoft/bing/samples/BingWebSearch.java
similarity index 100%
rename from samples/java/com/microsoft/bing/samples/BingWebSearchV7.java
rename to samples/java/com/microsoft/bing/samples/BingWebSearch.java