diff --git a/library/Solarium/Core/Plugin/Plugin.php b/library/Solarium/Core/Plugin/Plugin.php
index a1c18d0a8..3ff7e9cde 100644
--- a/library/Solarium/Core/Plugin/Plugin.php
+++ b/library/Solarium/Core/Plugin/Plugin.php
@@ -37,7 +37,9 @@
 namespace Solarium\Core\Plugin;
 
 /**
- * This class is for backwards compatibility, will be removed in 4.x releases
+ * This class is for backwards compatibility, will be removed in 4.x releases in favor of AbstractPlugin
+ *
+ * @deprecated
  */
 abstract class Plugin extends AbstractPlugin
 {
diff --git a/library/Solarium/Core/Query/Query.php b/library/Solarium/Core/Query/Query.php
index 5d01db771..007086ef5 100644
--- a/library/Solarium/Core/Query/Query.php
+++ b/library/Solarium/Core/Query/Query.php
@@ -41,7 +41,9 @@
 namespace Solarium\Core\Query;
 
 /**
- * This class is for backwards compatibility, will be removed in 4.x releases
+ * This class is for backwards compatibility, will be removed in 4.x releases in favor of AbstractQuery
+ *
+ * @deprecated
  */
 abstract class Query extends AbstractQuery
 {
diff --git a/library/Solarium/Core/Query/RequestBuilder.php b/library/Solarium/Core/Query/RequestBuilder.php
index 8c21a48fd..671be27dc 100644
--- a/library/Solarium/Core/Query/RequestBuilder.php
+++ b/library/Solarium/Core/Query/RequestBuilder.php
@@ -41,7 +41,9 @@
 namespace Solarium\Core\Query;
 
 /**
- * This class is for backwards compatibility, will be removed in 4.x releases
+ * This class is for backwards compatibility, will be removed in 4.x releases in favor of AbstractRequestBuilder
+ *
+ * @deprecated
  */
 abstract class RequestBuilder extends AbstractRequestBuilder
 {
diff --git a/library/Solarium/Core/Query/ResponseParser.php b/library/Solarium/Core/Query/ResponseParser.php
index 9948248cc..2ee30612b 100644
--- a/library/Solarium/Core/Query/ResponseParser.php
+++ b/library/Solarium/Core/Query/ResponseParser.php
@@ -41,7 +41,9 @@
 namespace Solarium\Core\Query;
 
 /**
- * This class is for backwards compatibility, will be removed in 4.x releases
+ * This class is for backwards compatibility, will be removed in 4.x releases in favor of AbstractResponseParser
+ *
+ * @deprecated
  */
 abstract class ResponseParser extends AbstractResponseParser
 {
diff --git a/library/Solarium/QueryType/Analysis/Query/Query.php b/library/Solarium/QueryType/Analysis/Query/Query.php
index 622489285..2fe911562 100644
--- a/library/Solarium/QueryType/Analysis/Query/Query.php
+++ b/library/Solarium/QueryType/Analysis/Query/Query.php
@@ -41,7 +41,9 @@
 namespace Solarium\QueryType\Analysis\Query;
 
 /**
- * This class is for backwards compatibility, will be removed in 4.x releases
+ * This class is for backwards compatibility, will be removed in 4.x releases in favor of AbstractQuery
+ *
+ * @deprecated
  */
 abstract class Query extends AbstractQuery
 {