diff --git a/app/controllers/spree/admin/orders_controller_decorator.rb b/app/controllers/spree/admin/orders_controller_decorator.rb
index f72ca3a..0824c87 100644
--- a/app/controllers/spree/admin/orders_controller_decorator.rb
+++ b/app/controllers/spree/admin/orders_controller_decorator.rb
@@ -1,6 +1,6 @@
 Spree::Admin::OrdersController.class_eval do
   def comments
     load_order
-    @comment_types = CommentType.where(:applies_to => "Order")
+    @comment_types = Spree::CommentType.where(:applies_to => "Order")
   end
 end
diff --git a/app/controllers/spree/admin/shipments_controller_decorator.rb b/app/controllers/spree/admin/shipments_controller_decorator.rb
index d43b696..19c2da1 100644
--- a/app/controllers/spree/admin/shipments_controller_decorator.rb
+++ b/app/controllers/spree/admin/shipments_controller_decorator.rb
@@ -1,6 +1,6 @@
 Spree::Admin::ShipmentsController.class_eval do
   def comments
     load_shipment
-    @comment_types = CommentType.where(:applies_to => "Shipment")
+    @comment_types = Spree::CommentType.where(:applies_to => "Shipment")
   end
 end