4 files changed, 5 insertions, 5 deletions
diff --git a/view/atom_feed.tpl b/view/atom_feed.tpl
index 60522eb50..ef02728b8 100644
--- a/view/atom_feed.tpl
+++ b/view/atom_feed.tpl
@@ -10,7 +10,7 @@
 
   <id>$feed_id</id>
   <title>$feed_title</title>
-  <generator uri="http://mistpark.com" version="2.0">Mistpark</generator>
+  <generator uri="http://friendika.com" version="2.0">Friendika</generator>
   <link rel="license" href="http://creativecommons.org/licenses/by/3.0/" />
   $hub
   $salmon
diff --git a/view/auto_request.tpl b/view/auto_request.tpl
index fe6e70a46..5ecce8957 100644
--- a/view/auto_request.tpl
+++ b/view/auto_request.tpl
@@ -4,7 +4,7 @@
 <p id="dfrn-request-intro">
 Please enter your profile address from one of the following supported social networks:<br />
 <ul id="dfrn-request-networks">
-<li><a href="http://dfrn.org">Mistpark/DFRN</a> (fully supported)</li>
+<li><a href="http://dfrn.org">Friendika/Mistpark</a> (fully supported)</li>
 <li><a href="http://ostatus.org">StatusNet/GNU-social/Federation</a> (limited - experimental)</li>
 </ul>
 </p>
diff --git a/view/dfrn_request.tpl b/view/dfrn_request.tpl
index 6cc965597..bee42c50e 100644
--- a/view/dfrn_request.tpl
+++ b/view/dfrn_request.tpl
@@ -5,7 +5,7 @@
 You may request a connection with this member if you have a valid profile address<br />
 on one of the following social networks:<br />
 <ul id="dfrn-request-networks">
-<li><a href="http://dfrn.org">Mistpark/DFRN</a> (fully supported)</li>
+<li><a href="http://dfrn.org">Friendika/Mistpark</a> (fully supported)</li>
 <li><a href="http://ostatus.org">StatusNet/GNU-social/Federation</a> (limited - experimental)</li>
 </ul>
 </p>
diff --git a/view/install_db.tpl b/view/install_db.tpl
index 00c3b8265..d5f28828e 100644
--- a/view/install_db.tpl
+++ b/view/install_db.tpl
@@ -1,9 +1,9 @@
 
-<h3>Mistpark Personal Edition</h3>
+<h3>Friendika Social Network</h3>
 <h3>Installation</h3>
 
 <p>
-In order to install Mistpark we need to know how to contact your database. Please contact your hosting provider or site administrator if you have questions about these settings. The database you specify below must already exist. If it does not, please create it before continuing. 
+In order to install Friendika we need to know how to contact your database. Please contact your hosting provider or site administrator if you have questions about these settings. The database you specify below must already exist. If it does not, please create it before continuing. 
 </p>
 
 <form id="install-form" action="install" method="post">