diff --git a/src/Controllers/Api/ComponentController.php b/src/Controllers/Api/ComponentController.php
index 34f328946..7387e1a68 100644
--- a/src/Controllers/Api/ComponentController.php
+++ b/src/Controllers/Api/ComponentController.php
@@ -11,8 +11,20 @@ class ComponentController extends Controller
 {
     use ControllerTrait;
 
+    /**
+     * The component repository instance.
+     *
+     * @var \CachetHQ\Cachet\Repositories\Component\ComponentRepository
+     */
     protected $component;
 
+    /**
+     * Create a new component controller instance.
+     *
+     * @param \CachetHQ\Cachet\Repositories\Component\ComponentRepository $component
+     *
+     * @return void
+     */
     public function __construct(ComponentRepository $component)
     {
         $this->component = $component;
diff --git a/src/Controllers/Api/IncidentController.php b/src/Controllers/Api/IncidentController.php
index 6670afb32..63b16e2e2 100644
--- a/src/Controllers/Api/IncidentController.php
+++ b/src/Controllers/Api/IncidentController.php
@@ -11,8 +11,20 @@ class IncidentController extends Controller
 {
     use ControllerTrait;
 
+    /**
+     * The incident repository instance.
+     *
+     * @var \CachetHQ\Cachet\Repositories\Incident\IncidentRepository
+     */
     protected $incident;
 
+    /**
+     * Create a new incident controller instance.
+     *
+     * @param \CachetHQ\Cachet\Repositories\Incident\IncidentRepository $incident
+     *
+     * @return void
+     */
     public function __construct(IncidentRepository $incident)
     {
         $this->incident = $incident;
@@ -33,7 +45,7 @@ class IncidentController extends Controller
      *
      * @param int $id
      *
-     * @return Incident
+     * @return \Incident
      */
     public function getIncident($id)
     {
@@ -43,7 +55,7 @@ class IncidentController extends Controller
     /**
      * Create a new incident.
      *
-     * @return Incident
+     * @return \Incident
      */
     public function postIncidents()
     {
@@ -55,7 +67,7 @@ class IncidentController extends Controller
      *
      * @param int $id
      *
-     * @return Incident
+     * @return \Incident
      */
     public function putIncident($id)
     {
diff --git a/src/Controllers/Api/MetricController.php b/src/Controllers/Api/MetricController.php
index 7360c1240..0070a412c 100644
--- a/src/Controllers/Api/MetricController.php
+++ b/src/Controllers/Api/MetricController.php
@@ -11,8 +11,20 @@ class MetricController extends Controller
 {
     use ControllerTrait;
 
+    /**
+     * The metric repository instance.
+     *
+     * @var \CachetHQ\Cachet\Repositories\Metric\MetricRepository
+     */
     protected $metric;
 
+    /**
+     * Create a new metric controller instance.
+     *
+     * @param \CachetHQ\Cachet\Repositories\Metric\MetricRepository $metric
+     *
+     * @return void
+     */
     public function __construct(MetricRepository $metric)
     {
         $this->metric = $metric;
@@ -32,7 +44,7 @@ class MetricController extends Controller
      *
      * @param int $id
      *
-     * @return Metric
+     * @return \Metric
      */
     public function getMetric($id)
     {
@@ -42,7 +54,7 @@ class MetricController extends Controller
     /**
      * Create a new metric.
      *
-     * @return Metric
+     * @return \Metric
      */
     public function postMetrics()
     {
@@ -54,7 +66,7 @@ class MetricController extends Controller
      *
      * @param int $id
      *
-     * @return Metric
+     * @return \Metric
      */
     public function putMetric($id)
     {
diff --git a/src/Controllers/Api/MetricPointController.php b/src/Controllers/Api/MetricPointController.php
index ffc0d2451..996c194fc 100644
--- a/src/Controllers/Api/MetricPointController.php
+++ b/src/Controllers/Api/MetricPointController.php
@@ -11,11 +11,23 @@ class MetricPointController extends Controller
 {
     use ControllerTrait;
 
-    protected $metricpoint;
+    /**
+     * The metric point repository instance.
+     *
+     * @var \CachetHQ\Cachet\Repositories\MetricPoint\MetricPointRepository
+     */
+    protected $metricPoint;
 
-    public function __construct(MetricPointRepository $metricpoint)
+    /**
+     * Create a new metric point controller instance.
+     *
+     * @param \CachetHQ\Cachet\Repositories\MetricPoint\MetricPointRepository $metricPoint
+     *
+     * @return void
+     */
+    public function __construct(MetricPointRepository $metricPoint)
     {
-        $this->metricpoint = $metricpoint;
+        $this->metricPoint = $metricPoint;
     }
     /**
      * Get all metric points.
@@ -24,7 +36,7 @@ class MetricPointController extends Controller
      */
     public function getMetricPoints()
     {
-        return $this->metricpoint->all();
+        return $this->metricPoint->all();
     }
 
     /**
@@ -32,20 +44,20 @@ class MetricPointController extends Controller
      *
      * @param int $id
      *
-     * @return MetricPoint
+     * @return \MetricPoint
      */
     public function getMetricPoint($id)
     {
-        return $this->metricpoint->findOrFail($id);
+        return $this->metricPoint->findOrFail($id);
     }
 
     /**
      * Create a new metric point.
      *
-     * @return MetricPoint
+     * @return \MetricPoint
      */
     public function postMetricPoints()
     {
-        return $this->metricpoint->create(Input::all());
+        return $this->metricPoint->create(Input::all());
     }
 }
diff --git a/src/Repositories/Component/EloquentComponentRepository.php b/src/Repositories/Component/EloquentComponentRepository.php
index e443f0e14..e6439d15a 100644
--- a/src/Repositories/Component/EloquentComponentRepository.php
+++ b/src/Repositories/Component/EloquentComponentRepository.php
@@ -7,13 +7,6 @@ use Component;
 
 class EloquentComponentRepository extends EloquentRepository implements ComponentRepository
 {
-    /**
-     * The eloquent model instance.
-     *
-     * @var \Component
-     */
-    protected $model;
-
     /**
      * Create a new eloquent component repository instance.
      *
diff --git a/src/Repositories/EloquentRepository.php b/src/Repositories/EloquentRepository.php
index 7d4e11d32..a317e911c 100644
--- a/src/Repositories/EloquentRepository.php
+++ b/src/Repositories/EloquentRepository.php
@@ -7,6 +7,13 @@ use Illuminate\Database\Eloquent\ModelNotFoundException;
 
 abstract class EloquentRepository
 {
+    /**
+     * The eloquent model instance.
+     *
+     * @var \Illuminate\Database\Eloquent\Model
+     */
+    protected $model;
+
     /**
      * Returns all models.
      *
diff --git a/src/Repositories/Incident/EloquentIncidentRepository.php b/src/Repositories/Incident/EloquentIncidentRepository.php
index 38b77120c..0056a31f9 100644
--- a/src/Repositories/Incident/EloquentIncidentRepository.php
+++ b/src/Repositories/Incident/EloquentIncidentRepository.php
@@ -7,13 +7,6 @@ use Incident;
 
 class EloquentIncidentRepository extends EloquentRepository implements IncidentRepository
 {
-    /**
-     * The eloquent model instance.
-     *
-     * @var \Incident
-     */
-    protected $model;
-
     /**
      * Create a new eloquent incident repository instance.
      *
diff --git a/src/Repositories/Metric/EloquentMetricRepository.php b/src/Repositories/Metric/EloquentMetricRepository.php
index 961d5da22..6873afa92 100644
--- a/src/Repositories/Metric/EloquentMetricRepository.php
+++ b/src/Repositories/Metric/EloquentMetricRepository.php
@@ -7,13 +7,6 @@ use Metric;
 
 class EloquentMetricRepository extends EloquentRepository implements MetricRepository
 {
-    /**
-     * The eloquent model instance.
-     *
-     * @var \Metric
-     */
-    protected $model;
-
     /**
      * Create a new eloquent metric repository instance.
      *
diff --git a/src/Repositories/MetricPoint/EloquentMetricPointRepository.php b/src/Repositories/MetricPoint/EloquentMetricPointRepository.php
index 17d547795..d549b6dec 100644
--- a/src/Repositories/MetricPoint/EloquentMetricPointRepository.php
+++ b/src/Repositories/MetricPoint/EloquentMetricPointRepository.php
@@ -7,13 +7,6 @@ use MetricPoint;
 
 class EloquentMetricPointRepository extends EloquentRepository implements MetricPointRepository
 {
-    /**
-     * The eloquent model instance.
-     *
-     * @var \MetricPoint
-     */
-    protected $model;
-
     /**
      * Create a new eloquent metric point repository instance.
      *