diff --git a/lib/acl9/model_extensions.rb b/lib/acl9/model_extensions.rb
index 4b387eb..898a8b6 100644
--- a/lib/acl9/model_extensions.rb
+++ b/lib/acl9/model_extensions.rb
@@ -1,5 +1,5 @@
-require File.join(File.dirname(__FILE__), 'model_extensions', 'subject')
-require File.join(File.dirname(__FILE__), 'model_extensions', 'object')
+require File.join(File.dirname(__FILE__), 'model_extensions', 'for_subject')
+require File.join(File.dirname(__FILE__), 'model_extensions', 'for_object')
 
 module Acl9
   module ModelExtensions  #:nodoc:
@@ -41,7 +41,7 @@ def acts_as_authorization_subject(options = {})
         self._auth_role_class_name = role
         self._auth_subject_class_name = self.to_s
 
-        include Acl9::ModelExtensions::Subject
+        include Acl9::ModelExtensions::ForSubject
       end
 
       # Add role query and set methods to the class (making it an auth object class).
@@ -91,7 +91,7 @@ def acts_as_authorization_object(options = {})
           :counter_sql => ("SELECT COUNT(DISTINCT #{subj_table}.id)" + sql_tables + sql_where),
           :readonly => true
 
-        include Acl9::ModelExtensions::Object
+        include Acl9::ModelExtensions::ForObject
       end
 
       # Make a class an auth role class.
diff --git a/lib/acl9/model_extensions/object.rb b/lib/acl9/model_extensions/for_object.rb
similarity index 98%
rename from lib/acl9/model_extensions/object.rb
rename to lib/acl9/model_extensions/for_object.rb
index d6bf82b..230f634 100644
--- a/lib/acl9/model_extensions/object.rb
+++ b/lib/acl9/model_extensions/for_object.rb
@@ -1,6 +1,6 @@
 module Acl9
   module ModelExtensions
-    module Object
+    module ForObject
       ##
       # Role check.
       #
diff --git a/lib/acl9/model_extensions/subject.rb b/lib/acl9/model_extensions/for_subject.rb
similarity index 99%
rename from lib/acl9/model_extensions/subject.rb
rename to lib/acl9/model_extensions/for_subject.rb
index 4b38439..1ee1593 100644
--- a/lib/acl9/model_extensions/subject.rb
+++ b/lib/acl9/model_extensions/for_subject.rb
@@ -1,6 +1,6 @@
 module Acl9
   module ModelExtensions
-    module Subject
+    module ForSubject
       ##
       # Role check.
       #