diff --git a/blog.py b/blog.py
index 19e572bc..2f0d4e70 100644
--- a/blog.py
+++ b/blog.py
@@ -10,11 +10,11 @@ import os
 from datetime import datetime
 
 from content import replaceEmojiFromTags
-from webinterface import getIconsDir
-from webinterface import getPostAttachmentsAsHtml
-from webinterface import htmlHeader
-from webinterface import htmlFooter
-from webinterface import addEmbeddedElements
+from webapp import getIconsDir
+from webapp import getPostAttachmentsAsHtml
+from webapp import htmlHeader
+from webapp import htmlFooter
+from webapp import addEmbeddedElements
 from utils import getNicknameFromActor
 from utils import getDomainFromActor
 from utils import locatePost
diff --git a/daemon.py b/daemon.py
index cdac5b1f..a58e3087 100644
--- a/daemon.py
+++ b/daemon.py
@@ -113,55 +113,55 @@ from blog import htmlBlogView
 from blog import htmlBlogPage
 from blog import htmlBlogPost
 from blog import htmlEditBlog
-from webinterface import htmlCitations
-from webinterface import htmlFollowingList
-from webinterface import getBlogAddress
-from webinterface import setBlogAddress
-from webinterface import htmlCalendarDeleteConfirm
-from webinterface import htmlDeletePost
-from webinterface import htmlAbout
-from webinterface import htmlRemoveSharedItem
-from webinterface import htmlInboxDMs
-from webinterface import htmlInboxReplies
-from webinterface import htmlInboxMedia
-from webinterface import htmlInboxBlogs
-from webinterface import htmlInboxNews
-from webinterface import htmlUnblockConfirm
-from webinterface import htmlPersonOptions
-from webinterface import htmlIndividualPost
-from webinterface import htmlProfile
-from webinterface import htmlInbox
-from webinterface import htmlBookmarks
-from webinterface import htmlEvents
-from webinterface import htmlShares
-from webinterface import htmlOutbox
-from webinterface import htmlModeration
-from webinterface import htmlPostReplies
-from webinterface import htmlLogin
-from webinterface import htmlSuspended
-from webinterface import htmlGetLoginCredentials
-from webinterface import htmlNewPost
-from webinterface import htmlFollowConfirm
-from webinterface import htmlCalendar
-from webinterface import htmlSearch
-from webinterface import htmlNewswireMobile
-from webinterface import htmlLinksMobile
-from webinterface import htmlSearchEmoji
-from webinterface import htmlSearchEmojiTextEntry
-from webinterface import htmlUnfollowConfirm
-from webinterface import htmlProfileAfterSearch
-from webinterface import htmlEditProfile
-from webinterface import htmlEditLinks
-from webinterface import htmlEditNewswire
-from webinterface import htmlEditNewsPost
-from webinterface import htmlTermsOfService
-from webinterface import htmlSkillsSearch
-from webinterface import htmlHistorySearch
-from webinterface import htmlHashtagSearch
-from webinterface import rssHashtagSearch
-from webinterface import htmlModerationInfo
-from webinterface import htmlSearchSharedItems
-from webinterface import htmlHashtagBlocked
+from webapp import htmlCitations
+from webapp import htmlFollowingList
+from webapp import getBlogAddress
+from webapp import setBlogAddress
+from webapp import htmlCalendarDeleteConfirm
+from webapp import htmlDeletePost
+from webapp import htmlAbout
+from webapp import htmlRemoveSharedItem
+from webapp import htmlInboxDMs
+from webapp import htmlInboxReplies
+from webapp import htmlInboxMedia
+from webapp import htmlInboxBlogs
+from webapp import htmlInboxNews
+from webapp import htmlUnblockConfirm
+from webapp import htmlPersonOptions
+from webapp import htmlIndividualPost
+from webapp import htmlProfile
+from webapp import htmlInbox
+from webapp import htmlBookmarks
+from webapp import htmlEvents
+from webapp import htmlShares
+from webapp import htmlOutbox
+from webapp import htmlModeration
+from webapp import htmlPostReplies
+from webapp import htmlLogin
+from webapp import htmlSuspended
+from webapp import htmlGetLoginCredentials
+from webapp import htmlNewPost
+from webapp import htmlFollowConfirm
+from webapp import htmlCalendar
+from webapp import htmlSearch
+from webapp import htmlNewswireMobile
+from webapp import htmlLinksMobile
+from webapp import htmlSearchEmoji
+from webapp import htmlSearchEmojiTextEntry
+from webapp import htmlUnfollowConfirm
+from webapp import htmlProfileAfterSearch
+from webapp import htmlEditProfile
+from webapp import htmlEditLinks
+from webapp import htmlEditNewswire
+from webapp import htmlEditNewsPost
+from webapp import htmlTermsOfService
+from webapp import htmlSkillsSearch
+from webapp import htmlHistorySearch
+from webapp import htmlHashtagSearch
+from webapp import rssHashtagSearch
+from webapp import htmlModerationInfo
+from webapp import htmlSearchSharedItems
+from webapp import htmlHashtagBlocked
 from shares import getSharesFeedForPerson
 from shares import addShare
 from shares import removeShare
diff --git a/inbox.py b/inbox.py
index a15b9f9c..4916af2f 100644
--- a/inbox.py
+++ b/inbox.py
@@ -56,9 +56,9 @@ from posts import isMuted
 from posts import isImageMedia
 from posts import sendSignedJson
 from posts import sendToFollowersThread
-from webinterface import individualPostAsHtml
-from webinterface import getIconsDir
-from webinterface import removeOldHashtags
+from webapp import individualPostAsHtml
+from webapp import getIconsDir
+from webapp import removeOldHashtags
 from question import questionUpdateVotes
 from media import replaceYouTube
 from git import isGitPatch
diff --git a/webinterface.py b/webapp.py
similarity index 100%
rename from webinterface.py
rename to webapp.py