diff --git a/plugins/selection/base.inc b/plugins/selection/EntityReference_SelectionHandler_CommerceCoupon.class.php
similarity index 60%
rename from plugins/selection/base.inc
rename to plugins/selection/EntityReference_SelectionHandler_CommerceCoupon.class.php
index 02f6823..bc8643a 100644
--- a/plugins/selection/base.inc
+++ b/plugins/selection/EntityReference_SelectionHandler_CommerceCoupon.class.php
@@ -1,22 +1,18 @@
 <?php
 
-$plugin = array(
-  'title' => t('Coupon simple'),
-  'handler' => array(
-    'class' => 'EntityReference_SelectionHandler_Generic_commerce_coupon',
-  ),
-);
-
-include_once drupal_get_path('module', 'entityreference') . '/plugins/selection/EntityReference_SelectionHandler_Generic.class.php';
+/**
+ * @file
+ * Defines a Entityreference selection handler for Commerce Coupon.
+ */
 
 /**
  * Extend the entity reference selection class to use the coupon code for
  * building the EFQ.
  */
-class EntityReference_SelectionHandler_Generic_commerce_coupon extends EntityReference_SelectionHandler_Generic {
+class EntityReference_SelectionHandler_CommerceCoupon extends EntityReference_SelectionHandler_Generic {
   public function buildEntityFieldQuery($match = NULL, $match_operator = 'CONTAINS') {
     $query = parent::buildEntityFieldQuery($match, $match_operator);
-    
+
     // If there's a match, query the coupon code.
     if (isset($match)) {
       $query->fieldCondition('commerce_coupon_code', 'value', $match, $match_operator);
@@ -28,5 +24,4 @@ class EntityReference_SelectionHandler_Generic_commerce_coupon extends EntityRef
     $wrapper = entity_metadata_wrapper('commerce_coupon', $entity);
     return $wrapper->commerce_coupon_code->value();
   }
-  
-}
\ No newline at end of file
+}
diff --git a/plugins/selection/coupon_simple.inc b/plugins/selection/coupon_simple.inc
new file mode 100644
index 0000000..1acbbc8
--- /dev/null
+++ b/plugins/selection/coupon_simple.inc
@@ -0,0 +1,12 @@
+<?php
+
+/**
+ * @file
+ * Ctools plugin that provides a special Entityreference selection for
+ * Commerce Coupon.
+ */
+
+$plugin = array(
+  'title' => t('Coupon simple'),
+  'class' => 'EntityReference_SelectionHandler_CommerceCoupon',
+);