diff --git a/PrintWrapper/src/main/java/com/zebra/printwrapper/ConnectToBluetoothPrinterTask.java b/PrintWrapper/src/main/java/com/zebra/printwrapper/GetBluetoothPrinterInfoTask.java
similarity index 82%
rename from PrintWrapper/src/main/java/com/zebra/printwrapper/ConnectToBluetoothPrinterTask.java
rename to PrintWrapper/src/main/java/com/zebra/printwrapper/GetBluetoothPrinterInfoTask.java
index a990e9e..b6df94b 100644
--- a/PrintWrapper/src/main/java/com/zebra/printwrapper/ConnectToBluetoothPrinterTask.java
+++ b/PrintWrapper/src/main/java/com/zebra/printwrapper/GetBluetoothPrinterInfoTask.java
@@ -1,13 +1,12 @@
 package com.zebra.printwrapper;
 
 import android.content.Context;
-import android.os.AsyncTask;
 
 import com.zebra.sdk.printer.discovery.DiscoveredPrinter;
 
 import java.util.Map;
 
-public class ConnectToBluetoothPrinterTask extends ExecutorTask<Void, Boolean, Map<String, String>> {
+public class GetBluetoothPrinterInfoTask extends ExecutorTask<Void, Boolean, Map<String, String>> {
 
     private static final String TAG = "CONNECT_BT_TASK";
 
@@ -15,7 +14,7 @@ public class ConnectToBluetoothPrinterTask extends ExecutorTask<Void, Boolean, M
     private SelectedPrinterTaskCallbacks callback;
     private DiscoveredPrinter selectedPrinter = null;
 
-    public ConnectToBluetoothPrinterTask(DiscoveredPrinter selectedPrinter, SelectedPrinterTaskCallbacks aCallback, Context aContext) {
+    public GetBluetoothPrinterInfoTask(DiscoveredPrinter selectedPrinter, SelectedPrinterTaskCallbacks aCallback, Context aContext) {
         this.context = aContext;
         this.callback = aCallback;
         this.selectedPrinter = selectedPrinter;
diff --git a/PrintWrapper/src/main/java/com/zebra/printwrapper/ConnectToTCPPrinterTask.java b/PrintWrapper/src/main/java/com/zebra/printwrapper/GetTCPPrinterInfoTask.java
similarity index 83%
rename from PrintWrapper/src/main/java/com/zebra/printwrapper/ConnectToTCPPrinterTask.java
rename to PrintWrapper/src/main/java/com/zebra/printwrapper/GetTCPPrinterInfoTask.java
index 1d82821..8cc6096 100644
--- a/PrintWrapper/src/main/java/com/zebra/printwrapper/ConnectToTCPPrinterTask.java
+++ b/PrintWrapper/src/main/java/com/zebra/printwrapper/GetTCPPrinterInfoTask.java
@@ -1,13 +1,12 @@
 package com.zebra.printwrapper;
 
 import android.content.Context;
-import android.os.AsyncTask;
 
 import com.zebra.sdk.printer.discovery.DiscoveredPrinter;
 
 import java.util.Map;
 
-public class ConnectToTCPPrinterTask extends ExecutorTask<Void, Boolean, Map<String,String>> {
+public class GetTCPPrinterInfoTask extends ExecutorTask<Void, Boolean, Map<String,String>> {
 
     private static final String TAG = "CONNECT_TCP_TASK";
 
@@ -15,7 +14,7 @@ public class ConnectToTCPPrinterTask extends ExecutorTask<Void, Boolean, Map<Str
     private SelectedPrinterTaskCallbacks callback;
     private DiscoveredPrinter selectedPrinter = null;
 
-    public ConnectToTCPPrinterTask(DiscoveredPrinter selectedPrinter, SelectedPrinterTaskCallbacks aCallback, Context aContext) {
+    public GetTCPPrinterInfoTask(DiscoveredPrinter selectedPrinter, SelectedPrinterTaskCallbacks aCallback, Context aContext) {
         this.context = aContext;
         this.callback = aCallback;
         this.selectedPrinter = selectedPrinter;
diff --git a/PrintWrapper/src/main/java/com/zebra/printwrapper/ConnectToUSBPrinterTask.java b/PrintWrapper/src/main/java/com/zebra/printwrapper/GetUSBPrinterInfoTask.java
similarity index 82%
rename from PrintWrapper/src/main/java/com/zebra/printwrapper/ConnectToUSBPrinterTask.java
rename to PrintWrapper/src/main/java/com/zebra/printwrapper/GetUSBPrinterInfoTask.java
index 484fac7..17c31ee 100644
--- a/PrintWrapper/src/main/java/com/zebra/printwrapper/ConnectToUSBPrinterTask.java
+++ b/PrintWrapper/src/main/java/com/zebra/printwrapper/GetUSBPrinterInfoTask.java
@@ -1,13 +1,12 @@
 package com.zebra.printwrapper;
 
 import android.content.Context;
-import android.os.AsyncTask;
 
 import com.zebra.sdk.printer.discovery.DiscoveredPrinter;
 
 import java.util.Map;
 
-public class ConnectToUSBPrinterTask extends ExecutorTask<Void, Boolean, Map<String, String>> {
+public class GetUSBPrinterInfoTask extends ExecutorTask<Void, Boolean, Map<String, String>> {
 
     private static final String TAG = "CONNECT_USB_TASK";
 
@@ -15,7 +14,7 @@ public class ConnectToUSBPrinterTask extends ExecutorTask<Void, Boolean, Map<Str
     private SelectedPrinterTaskCallbacks callback;
     private DiscoveredPrinter selectedPrinter = null;
 
-    public ConnectToUSBPrinterTask(DiscoveredPrinter selectedPrinter, SelectedPrinterTaskCallbacks aCallback, Context aContext) {
+    public GetUSBPrinterInfoTask(DiscoveredPrinter selectedPrinter, SelectedPrinterTaskCallbacks aCallback, Context aContext) {
         this.context = aContext;
         this.callback = aCallback;
         this.selectedPrinter = selectedPrinter;