diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index 62836c4a1..7f02db097 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -335,8 +335,8 @@ src/Simple/_SimpleDoc.py
 #
 #   web
 #
-src/web/grampsdb/views.py
-src/web/utils.py
+src/webapp/grampsdb/views.py
+src/webapp/utils.py
 
 #
 #   Glade files
diff --git a/src/gen/db/__init__.py b/src/gen/db/__init__.py
index 1c2576290..a05a4204c 100644
--- a/src/gen/db/__init__.py
+++ b/src/gen/db/__init__.py
@@ -41,7 +41,7 @@
             - B{DbReadBase} - virtual and implementation-independent methods for reading data (U{gen/db/base.py<http://gramps.svn.sourceforge.net/viewvc/gramps/trunk/src/gen/db/base.py?view=markup})
             - B{Callback} - callback and signal functions (U{gen/utils/callback.py<http://gramps.svn.sourceforge.net/viewvc/gramps/trunk/src/gen/utils/callback.py?view=markup})
         - B{UpdateCallback} - callback functionality (U{gen/updatecallback.py<http://gramps.svn.sourceforge.net/viewvc/gramps/trunk/src/gen/db/read.py?view=markup gen/updatecallback.py?view=markup>})
-    - B{DbDjango} - read and write implementation to Django-based databases (U{web/dbdjango.py<http://gramps.svn.sourceforge.net/viewvc/gramps/trunk/src/web/dbdjango.py?view=markup})
+    - B{DbDjango} - read and write implementation to Django-based databases (U{web/dbdjango.py<http://gramps.svn.sourceforge.net/viewvc/gramps/trunk/src/webapp/dbdjango.py?view=markup})
         - B{DbWriteBase} - virtual and implementation-independent methods for reading data (U{gen/db/base.py<http://gramps.svn.sourceforge.net/viewvc/gramps/trunk/src/gen/db/base.py?view=markup})
         - B{DbReadBase} - virtual and implementation-independent methods for reading data (U{gen/db/base.py<http://gramps.svn.sourceforge.net/viewvc/gramps/trunk/src/gen/db/base.py?view=markup})
 
diff --git a/src/web/Makefile b/src/webapp/Makefile
similarity index 100%
rename from src/web/Makefile
rename to src/webapp/Makefile
diff --git a/src/web/__init__.py b/src/webapp/__init__.py
similarity index 100%
rename from src/web/__init__.py
rename to src/webapp/__init__.py
diff --git a/src/web/dbdjango.py b/src/webapp/dbdjango.py
similarity index 99%
rename from src/web/dbdjango.py
rename to src/webapp/dbdjango.py
index 938f7a9b8..51f1bf308 100644
--- a/src/web/dbdjango.py
+++ b/src/webapp/dbdjango.py
@@ -40,7 +40,7 @@ from gen.db import (PERSON_KEY,
                     REPOSITORY_KEY,
                     NOTE_KEY)
 import Utils
-from web.libdjango import DjangoInterface
+from webapp.libdjango import DjangoInterface
 
 class Cursor(object):
     def __init__(self, model, func):
diff --git a/src/web/grampsdb/__init__.py b/src/webapp/grampsdb/__init__.py
similarity index 100%
rename from src/web/grampsdb/__init__.py
rename to src/webapp/grampsdb/__init__.py
diff --git a/src/web/grampsdb/admin.py b/src/webapp/grampsdb/admin.py
similarity index 100%
rename from src/web/grampsdb/admin.py
rename to src/webapp/grampsdb/admin.py
diff --git a/src/web/grampsdb/forms.py b/src/webapp/grampsdb/forms.py
similarity index 100%
rename from src/web/grampsdb/forms.py
rename to src/webapp/grampsdb/forms.py
diff --git a/src/web/grampsdb/models.py b/src/webapp/grampsdb/models.py
similarity index 100%
rename from src/web/grampsdb/models.py
rename to src/webapp/grampsdb/models.py
diff --git a/src/web/grampsdb/profile.py b/src/webapp/grampsdb/profile.py
similarity index 100%
rename from src/web/grampsdb/profile.py
rename to src/webapp/grampsdb/profile.py
diff --git a/src/web/grampsdb/sql/childref.sql b/src/webapp/grampsdb/sql/childref.sql
similarity index 100%
rename from src/web/grampsdb/sql/childref.sql
rename to src/webapp/grampsdb/sql/childref.sql
diff --git a/src/web/grampsdb/sql/eventref.sql b/src/webapp/grampsdb/sql/eventref.sql
similarity index 100%
rename from src/web/grampsdb/sql/eventref.sql
rename to src/webapp/grampsdb/sql/eventref.sql
diff --git a/src/web/grampsdb/sql/name.sql b/src/webapp/grampsdb/sql/name.sql
similarity index 100%
rename from src/web/grampsdb/sql/name.sql
rename to src/webapp/grampsdb/sql/name.sql
diff --git a/src/web/grampsdb/sql/noteref.sql b/src/webapp/grampsdb/sql/noteref.sql
similarity index 100%
rename from src/web/grampsdb/sql/noteref.sql
rename to src/webapp/grampsdb/sql/noteref.sql
diff --git a/src/web/grampsdb/sql/sourceref.sql b/src/webapp/grampsdb/sql/sourceref.sql
similarity index 100%
rename from src/web/grampsdb/sql/sourceref.sql
rename to src/webapp/grampsdb/sql/sourceref.sql
diff --git a/src/web/grampsdb/templatetags/__init__.py b/src/webapp/grampsdb/templatetags/__init__.py
similarity index 100%
rename from src/web/grampsdb/templatetags/__init__.py
rename to src/webapp/grampsdb/templatetags/__init__.py
diff --git a/src/web/grampsdb/templatetags/my_tags.py b/src/webapp/grampsdb/templatetags/my_tags.py
similarity index 100%
rename from src/web/grampsdb/templatetags/my_tags.py
rename to src/webapp/grampsdb/templatetags/my_tags.py
diff --git a/src/web/grampsdb/views.py b/src/webapp/grampsdb/views.py
similarity index 100%
rename from src/web/grampsdb/views.py
rename to src/webapp/grampsdb/views.py
diff --git a/src/web/init.py b/src/webapp/init.py
similarity index 100%
rename from src/web/init.py
rename to src/webapp/init.py
diff --git a/src/web/init_gramps.py b/src/webapp/init_gramps.py
similarity index 100%
rename from src/web/init_gramps.py
rename to src/webapp/init_gramps.py
diff --git a/src/web/libdjango.py b/src/webapp/libdjango.py
similarity index 99%
rename from src/web/libdjango.py
rename to src/webapp/libdjango.py
index 26b2a5761..0d926eb32 100644
--- a/src/web/libdjango.py
+++ b/src/webapp/libdjango.py
@@ -36,9 +36,9 @@ import base64
 # Gramps Modules
 #
 #------------------------------------------------------------------------
-import web.grampsdb.models as models
+import webapp.grampsdb.models as models
 from django.contrib.contenttypes.models import ContentType
-import web
+import webapp
 import gen
 
 # To get a django person from a django database:
diff --git a/src/web/manage.py b/src/webapp/manage.py
similarity index 100%
rename from src/web/manage.py
rename to src/webapp/manage.py
diff --git a/src/web/reports.py b/src/webapp/reports.py
similarity index 100%
rename from src/web/reports.py
rename to src/webapp/reports.py
diff --git a/src/web/settings.py b/src/webapp/settings.py
similarity index 100%
rename from src/web/settings.py
rename to src/webapp/settings.py
diff --git a/src/web/sortheaders.py b/src/webapp/sortheaders.py
similarity index 100%
rename from src/web/sortheaders.py
rename to src/webapp/sortheaders.py
diff --git a/src/web/urls.py b/src/webapp/urls.py
similarity index 100%
rename from src/web/urls.py
rename to src/webapp/urls.py
diff --git a/src/web/utils.py b/src/webapp/utils.py
similarity index 100%
rename from src/web/utils.py
rename to src/webapp/utils.py