diff --git a/src/Form/AbstractFormHandler.php b/src/Form/AbstractFormHandler.php
index a7fc48d..38e0dd6 100644
--- a/src/Form/AbstractFormHandler.php
+++ b/src/Form/AbstractFormHandler.php
@@ -8,6 +8,8 @@
 
 /**
  * @author Yannick de Lange <ydelange@hostnet.nl>
+ *
+ * @deprecated Use the HandlerTypeInterface instead. Will be removed in version 2.0.
  */
 abstract class AbstractFormHandler implements NamedFormHandlerInterface
 {
diff --git a/src/Form/Exception/FormNotFoundException.php b/src/Form/Exception/FormNotFoundException.php
index 88bbfaa..5328a1f 100644
--- a/src/Form/Exception/FormNotFoundException.php
+++ b/src/Form/Exception/FormNotFoundException.php
@@ -8,6 +8,8 @@
 
 /**
  * @author Yannick de Lange <ydelange@hostnet.nl>
+ *
+ * @deprecated Use the class InvalidHandlerTypeException instead. Will be removed in version 2.0.
  */
 class FormNotFoundException extends \RuntimeException
 {
diff --git a/src/Form/FormFailureHandlerInterface.php b/src/Form/FormFailureHandlerInterface.php
index 3bd687c..75c4041 100644
--- a/src/Form/FormFailureHandlerInterface.php
+++ b/src/Form/FormFailureHandlerInterface.php
@@ -9,6 +9,8 @@
 /**
  * @author Iltar van der Berg <ivanderberg@hostnet.nl>
  * @author Yannick de Lange <ydelange@hostnet.nl>
+ *
+ * @deprecated Use the HandlerConfigInterface instead. Will be removed in version 2.0.
  */
 interface FormFailureHandlerInterface
 {
diff --git a/src/Form/FormHandlerInterface.php b/src/Form/FormHandlerInterface.php
index 2ac32c8..04024c3 100644
--- a/src/Form/FormHandlerInterface.php
+++ b/src/Form/FormHandlerInterface.php
@@ -4,12 +4,21 @@
  */
 namespace Hostnet\Component\Form;
 
+use Hostnet\Component\FormHandler\HandlerTypeInterface;
 use Symfony\Component\Form\FormInterface;
 use Symfony\Component\Form\FormTypeInterface;
 
+@trigger_error(sprintf(
+   '%s is deprecated, use %s instead.',
+   FormHandlerInterface::class,
+   HandlerTypeInterface::class
+), E_USER_DEPRECATED);
+
 /**
  * @author Iltar van der Berg <ivanderberg@hostnet.nl>
  * @author Yannick de Lange <ydelange@hostnet.nl>
+ *
+ * @deprecated Use the HandlerTypeInterface instead. Will be removed in version 2.0.
  */
 interface FormHandlerInterface
 {
diff --git a/src/Form/FormProviderInterface.php b/src/Form/FormProviderInterface.php
index e498d28..c5255ec 100644
--- a/src/Form/FormProviderInterface.php
+++ b/src/Form/FormProviderInterface.php
@@ -10,6 +10,8 @@
 /**
  * @author Iltar van der Berg <ivanderberg@hostnet.nl>
  * @author Yannick de Lange <ydelange@hostnet.nl>
+ *
+ * @deprecated Use the HandlerConfigInterface instead. Will be removed in version 2.0.
  */
 interface FormProviderInterface
 {
diff --git a/src/Form/FormSuccesHandlerInterface.php b/src/Form/FormSuccesHandlerInterface.php
index 0a03472..3ed7a1b 100644
--- a/src/Form/FormSuccesHandlerInterface.php
+++ b/src/Form/FormSuccesHandlerInterface.php
@@ -14,7 +14,7 @@
  * @author Iltar van der Berg <ivanderberg@hostnet.nl>
  * @author Yannick de Lange <ydelange@hostnet.nl>
  *
- * @deprecated Use {@see FormSuccessHandlerInterface} instead.
+ * @deprecated Use the HandlerConfigInterface instead. Will be removed in version 2.0.
  */
 interface FormSuccesHandlerInterface extends FormSuccessHandlerInterface
 {
diff --git a/src/Form/FormSuccessHandlerInterface.php b/src/Form/FormSuccessHandlerInterface.php
index a18c0c8..e4faf76 100644
--- a/src/Form/FormSuccessHandlerInterface.php
+++ b/src/Form/FormSuccessHandlerInterface.php
@@ -9,6 +9,8 @@
 /**
  * @author Iltar van der Berg <ivanderberg@hostnet.nl>
  * @author Yannick de Lange <ydelange@hostnet.nl>
+ *
+ * @deprecated Use the HandlerConfigInterface instead. Will be removed in version 2.0.
  */
 interface FormSuccessHandlerInterface
 {
diff --git a/src/Form/NamedFormHandlerInterface.php b/src/Form/NamedFormHandlerInterface.php
index 99d425e..53a5b27 100644
--- a/src/Form/NamedFormHandlerInterface.php
+++ b/src/Form/NamedFormHandlerInterface.php
@@ -6,6 +6,8 @@
 
 /**
  * @author Yannick de Lange <ydelange@hostnet.nl>
+ *
+ * @deprecated Use the HandlerConfigInterface instead. Will be removed in version 2.0.
  */
 interface NamedFormHandlerInterface extends FormHandlerInterface
 {
diff --git a/src/Form/Simple/SimpleFormProvider.php b/src/Form/Simple/SimpleFormProvider.php
index f1dea55..9857b19 100644
--- a/src/Form/Simple/SimpleFormProvider.php
+++ b/src/Form/Simple/SimpleFormProvider.php
@@ -17,6 +17,8 @@
 /**
  * @author Iltar van der Berg <ivanderberg@hostnet.nl>
  * @author Yannick de Lange <ydelange@hostnet.nl>
+ *
+ * @deprecated Use the HandlerFactoryInterface instead. Will be removed in version 2.0.
  */
 class SimpleFormProvider implements FormProviderInterface
 {
diff --git a/src/FormHandler/HandlerTypeAdapter.php b/src/FormHandler/HandlerTypeAdapter.php
index 6d15618..a199e59 100644
--- a/src/FormHandler/HandlerTypeAdapter.php
+++ b/src/FormHandler/HandlerTypeAdapter.php
@@ -14,6 +14,8 @@
 /**
  * Wrapper class around the old FormHandlerInterface classes. This provides the
  * BC layer so they can be used with the new handler factory.
+ *
+ * @deprecated Support for FormHandlerInterface will be removed in version 2.0.
  */
 final class HandlerTypeAdapter implements HandlerTypeInterface
 {