Merge remote branch 'gallery3/master'

2 files changed, 2 insertions, 2 deletions

diff --git a/modules/user/models/group.php b/modules/user/models/group.php
index b27c7250..17d9320b 100644
--- a/modules/user/models/group.php
+++ b/modules/user/models/group.php
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
-class Group_Model extends ORM implements Group_Definition {
+class Group_Model_Core extends ORM implements Group_Definition {
   protected $has_and_belongs_to_many = array("users");
 
   /**
diff --git a/modules/user/models/user.php b/modules/user/models/user.php
index b28288be..55bb3d6a 100644
--- a/modules/user/models/user.php
+++ b/modules/user/models/user.php
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
-class User_Model extends ORM implements User_Definition {
+class User_Model_Core extends ORM implements User_Definition {
   protected $has_and_belongs_to_many = array("groups");
   protected $password_length = null;