diff --git a/src/main/java/io/appium/java_client/pagefactory/ElementInterceptor.java b/src/main/java/io/appium/java_client/pagefactory/ElementInterceptor.java
index a95740aff..35a703e8a 100644
--- a/src/main/java/io/appium/java_client/pagefactory/ElementInterceptor.java
+++ b/src/main/java/io/appium/java_client/pagefactory/ElementInterceptor.java
@@ -26,7 +26,7 @@
 import java.lang.reflect.Method;
 
 /**
- * Intercepts requests to {@link io.appium.java_client.MobileElement}.
+ * Intercepts requests to {@link WebElement}.
  */
 class ElementInterceptor extends InterceptorOfASingleElement {
 
diff --git a/src/main/java/io/appium/java_client/pagefactory/ElementListInterceptor.java b/src/main/java/io/appium/java_client/pagefactory/ElementListInterceptor.java
index 08c58627c..5dd385b29 100644
--- a/src/main/java/io/appium/java_client/pagefactory/ElementListInterceptor.java
+++ b/src/main/java/io/appium/java_client/pagefactory/ElementListInterceptor.java
@@ -26,7 +26,7 @@
 import java.util.List;
 
 /**
- * Intercepts requests to the list of {@link io.appium.java_client.MobileElement}.
+ * Intercepts requests to the list of {@link WebElement}.
  */
 class ElementListInterceptor extends InterceptorOfAListOfElements {
 
diff --git a/src/main/java/io/appium/java_client/pagefactory/utils/WebDriverUnpackUtility.java b/src/main/java/io/appium/java_client/pagefactory/utils/WebDriverUnpackUtility.java
index e11aa2e4d..8aa5f7634 100644
--- a/src/main/java/io/appium/java_client/pagefactory/utils/WebDriverUnpackUtility.java
+++ b/src/main/java/io/appium/java_client/pagefactory/utils/WebDriverUnpackUtility.java
@@ -55,8 +55,8 @@ public static WebDriver unpackWebDriverFromSearchContext(SearchContext searchCon
                     ((WrapsDriver) searchContext).getWrappedDriver());
         }
 
-        // Search context it is not only Webdriver. Webelement is search context too.
-        // RemoteWebElement and MobileElement implement WrapsDriver
+        // Search context it is not only WebDriver. WebElement is search context too.
+        // RemoteWebElement implements WrapsDriver
         if (searchContext instanceof WrapsElement) {
             return unpackWebDriverFromSearchContext(
                     ((WrapsElement) searchContext).getWrappedElement());