diff --git a/app/forms/trophies.py b/app/forms/trophy.py
similarity index 100%
rename from app/forms/trophies.py
rename to app/forms/trophy.py
diff --git a/app/models/privs.py b/app/models/priv.py
similarity index 97%
rename from app/models/privs.py
rename to app/models/priv.py
index 692b3ae..ff96ae4 100644
--- a/app/models/privs.py
+++ b/app/models/priv.py
@@ -1,5 +1,5 @@
 # Planète Casio v5
-# models.privs: Database models for groups and privilege management
+# models.priv: Database models for groups and privilege management
 
 from app import db
 
diff --git a/app/models/trophies.py b/app/models/trophy.py
similarity index 100%
rename from app/models/trophies.py
rename to app/models/trophy.py
diff --git a/app/models/users.py b/app/models/user.py
similarity index 99%
rename from app/models/users.py
rename to app/models/user.py
index faf4add..13c8ee2 100644
--- a/app/models/users.py
+++ b/app/models/user.py
@@ -4,9 +4,9 @@ from sqlalchemy import func as SQLfunc
 from os.path import isfile
 from PIL import Image
 from app import app, db
-from app.models.privs import SpecialPrivilege, Group, GroupMember, \
+from app.models.priv import SpecialPrivilege, Group, GroupMember, \
     GroupPrivilege
-from app.models.trophies import Trophy, TrophyMember, Title
+from app.models.trophy import Trophy, TrophyMember, Title
 from app.models.notification import Notification
 import app.utils.unicode_names as unicode_names
 import app.utils.ldap as ldap
diff --git a/app/routes/account/account.py b/app/routes/account/account.py
index 18fad37..f5df8d5 100644
--- a/app/routes/account/account.py
+++ b/app/routes/account/account.py
@@ -3,8 +3,8 @@ from flask_login import login_required, current_user, logout_user
 from app import app, db
 from app.forms.account import UpdateAccountForm, RegistrationForm, \
     DeleteAccountForm, AskResetPasswordForm, ResetPasswordForm
-from app.models.users import Member
-from app.models.trophies import Title
+from app.model.user import Member
+from app.models.trophy import Title
 from app.utils.render import render
 from app.utils.send_mail import send_validation_mail, send_reset_password_mail
 from app.utils.priv_required import guest_only
diff --git a/app/routes/account/login.py b/app/routes/account/login.py
index 2c4238e..13709c6 100644
--- a/app/routes/account/login.py
+++ b/app/routes/account/login.py
@@ -3,8 +3,8 @@ from flask_login import login_user, logout_user, login_required, current_user
 from urllib.parse import urlparse, urljoin
 from app import app
 from app.forms.login import LoginForm
-from app.models.users import Member
-from app.models.privs import Group
+from app.model.user import Member
+from app.models.priv import Group
 from app.utils.render import render
 from app.utils.send_mail import send_validation_mail
 import datetime
diff --git a/app/routes/admin/account.py b/app/routes/admin/account.py
index 1abd8c0..d6bf49c 100644
--- a/app/routes/admin/account.py
+++ b/app/routes/admin/account.py
@@ -2,9 +2,9 @@ from flask import flash, redirect, url_for, request
 from flask_login import current_user
 from wtforms import BooleanField
 from app.utils.priv_required import priv_required
-from app.models.users import Member
-from app.models.trophies import Trophy, Title
-from app.models.privs import Group
+from app.model.user import Member
+from app.models.trophy import Trophy, Title
+from app.models.priv import Group
 from app.forms.account import AdminUpdateAccountForm, AdminDeleteAccountForm, \
     AdminAccountEditTrophyForm, AdminAccountEditGroupForm
 from app.utils.render import render
diff --git a/app/routes/admin/groups.py b/app/routes/admin/groups.py
index 35a03cb..611997c 100644
--- a/app/routes/admin/groups.py
+++ b/app/routes/admin/groups.py
@@ -1,8 +1,8 @@
 from app.utils.priv_required import priv_required
 from flask_wtf import FlaskForm
 from wtforms import SubmitField
-from app.models.users import Member, Group, GroupPrivilege
-from app.models.privs import SpecialPrivilege
+from app.model.user import Member, Group, GroupPrivilege
+from app.models.priv import SpecialPrivilege
 from app.utils.render import render
 from app import app, db
 import yaml
diff --git a/app/routes/admin/trophies.py b/app/routes/admin/trophies.py
index 5eb59d0..80265bc 100644
--- a/app/routes/admin/trophies.py
+++ b/app/routes/admin/trophies.py
@@ -1,7 +1,7 @@
 from flask import request, flash, redirect, url_for
 from app.utils.priv_required import priv_required
-from app.models.trophies import Trophy, Title
-from app.forms.trophies import TrophyForm, DeleteTrophyForm
+from app.models.trophy import Trophy, Title
+from app.forms.trophy import TrophyForm, DeleteTrophyForm
 from app.utils.render import render
 from app import app, db
 
diff --git a/app/routes/forum/index.py b/app/routes/forum/index.py
index 8843824..55a97ff 100644
--- a/app/routes/forum/index.py
+++ b/app/routes/forum/index.py
@@ -9,7 +9,7 @@ from app.models.forum import Forum
 from app.models.topic import Topic
 from app.models.thread import Thread
 from app.models.comment import Comment
-from app.models.users import Guest
+from app.model.user import Guest
 from app.models.attachment import Attachment
 
 
diff --git a/app/routes/forum/topic.py b/app/routes/forum/topic.py
index d150c65..f855936 100644
--- a/app/routes/forum/topic.py
+++ b/app/routes/forum/topic.py
@@ -9,7 +9,7 @@ from app.models.forum import Forum
 from app.models.topic import Topic
 from app.models.thread import Thread
 from app.models.comment import Comment
-from app.models.users import Guest
+from app.model.user import Guest
 from app.models.attachment import Attachment
 
 
diff --git a/app/routes/users.py b/app/routes/users.py
index 7172654..a1691af 100644
--- a/app/routes/users.py
+++ b/app/routes/users.py
@@ -2,8 +2,8 @@ from flask import redirect, url_for, send_file
 from werkzeug.utils import secure_filename
 import os.path
 from app import app
-from app.models.users import Member
-from app.models.trophies import Trophy
+from app.model.user import Member
+from app.models.trophy import Trophy
 from app.utils import unicode_names
 from app.utils.render import render
 from config import V5Config
diff --git a/app/utils/filters/is_title.py b/app/utils/filters/is_title.py
index bee2c42..15e3c39 100644
--- a/app/utils/filters/is_title.py
+++ b/app/utils/filters/is_title.py
@@ -1,5 +1,5 @@
 from app import app
-from app.models.trophies import Title
+from app.models.trophy import Title
 
 
 @app.template_filter('is_title')
diff --git a/app/utils/notify.py b/app/utils/notify.py
index 86d9f80..c26df9e 100644
--- a/app/utils/notify.py
+++ b/app/utils/notify.py
@@ -1,6 +1,6 @@
 from app import db
 from app.models.notification import Notification
-from app.models.users import Member
+from app.model.user import Member
 
 def notify(user, message, href=None):
     """ Notify a user (by id, name or object reference) with a message.
diff --git a/app/utils/valid_name.py b/app/utils/valid_name.py
index 158cc40..bf8ef39 100644
--- a/app/utils/valid_name.py
+++ b/app/utils/valid_name.py
@@ -1,5 +1,5 @@
 from app.utils.unicode_names import normalize
-from app.models.users import User
+from app.model.user import User
 import re
 
 def valid_name(name, msg=False):
diff --git a/app/utils/validators/__init__.py b/app/utils/validators/__init__.py
index c7d2e70..0d97e69 100644
--- a/app/utils/validators/__init__.py
+++ b/app/utils/validators/__init__.py
@@ -1,7 +1,7 @@
 from flask_login import current_user
 from wtforms.validators import ValidationError
-from app.models.users import Member
-from app.models.trophies import Title
+from app.model.user import Member
+from app.models.trophy import Title
 from werkzeug.exceptions import NotFound
 
 from app.utils.validators.file import *
diff --git a/app/utils/validators/name.py b/app/utils/validators/name.py
index b86f23f..6a98c6f 100644
--- a/app/utils/validators/name.py
+++ b/app/utils/validators/name.py
@@ -1,6 +1,6 @@
 from wtforms.validators import ValidationError
 from app.utils.valid_name import valid_name
-from app.models.users import User, Member
+from app.model.user import User, Member
 import app.utils.ldap as ldap
 from app.utils.unicode_names import normalize
 from config import V5Config
diff --git a/master.py b/master.py
index f03ccc8..e959fcc 100755
--- a/master.py
+++ b/master.py
@@ -1,9 +1,9 @@
 #! /usr/bin/python3
 
 from app import app, db
-from app.models.users import Member, Group, GroupPrivilege
-from app.models.privs import SpecialPrivilege
-from app.models.trophies import Trophy, Title
+from app.model.user import Member, Group, GroupPrivilege
+from app.models.priv import SpecialPrivilege
+from app.models.trophy import Trophy, Title
 from app.models.forum import Forum
 from app.utils import unicode_names
 import os