change LACONICA to STATUSNET

117 files changed, 122 insertions, 122 deletions

diff --git a/actions/accesstoken.php b/actions/accesstoken.php
index 551c2e4d8..f1ddfc6a1 100644
--- a/actions/accesstoken.php
+++ b/actions/accesstoken.php
@@ -28,7 +28,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/all.php b/actions/all.php
index 5a26efa28..6dbab080f 100644
--- a/actions/all.php
+++ b/actions/all.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) { exit(1); }
+if (!defined('STATUSNET')) { exit(1); }
 
 require_once INSTALLDIR.'/lib/personalgroupnav.php';
 require_once INSTALLDIR.'/lib/noticelist.php';
diff --git a/actions/allrss.php b/actions/allrss.php
index 0313ef611..a5447fa9f 100644
--- a/actions/allrss.php
+++ b/actions/allrss.php
@@ -29,7 +29,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/api.php b/actions/api.php
index 2e9cc6618..897e848c1 100644
--- a/actions/api.php
+++ b/actions/api.php
@@ -17,7 +17,7 @@
  * along with this program.     If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) { exit(1); }
+if (!defined('STATUSNET')) { exit(1); }
 
 class ApiAction extends Action
 {
diff --git a/actions/attachment.php b/actions/attachment.php
index f417d47ee..5d11faad8 100644
--- a/actions/attachment.php
+++ b/actions/attachment.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/attachment_ajax.php b/actions/attachment_ajax.php
index 6701a9463..af37c9bcb 100644
--- a/actions/attachment_ajax.php
+++ b/actions/attachment_ajax.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/attachment_thumbnail.php b/actions/attachment_thumbnail.php
index e27480424..7add8e278 100644
--- a/actions/attachment_thumbnail.php
+++ b/actions/attachment_thumbnail.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/avatarbynickname.php b/actions/avatarbynickname.php
index 0b0d77aad..e7ebaeee2 100644
--- a/actions/avatarbynickname.php
+++ b/actions/avatarbynickname.php
@@ -28,7 +28,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/avatarsettings.php b/actions/avatarsettings.php
index d5be3463b..54baef88f 100644
--- a/actions/avatarsettings.php
+++ b/actions/avatarsettings.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/block.php b/actions/block.php
index 9687783a8..2441c6fba 100644
--- a/actions/block.php
+++ b/actions/block.php
@@ -28,7 +28,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/blockedfromgroup.php b/actions/blockedfromgroup.php
index dea868fc6..5b5c8bcfa 100644
--- a/actions/blockedfromgroup.php
+++ b/actions/blockedfromgroup.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/confirmaddress.php b/actions/confirmaddress.php
index 2b7b949a4..94cd6ddf4 100644
--- a/actions/confirmaddress.php
+++ b/actions/confirmaddress.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/conversation.php b/actions/conversation.php
index b284e4dd7..c4a4e80da 100644
--- a/actions/conversation.php
+++ b/actions/conversation.php
@@ -27,7 +27,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/deletenotice.php b/actions/deletenotice.php
index 24f70b5db..8f6e9bdd1 100644
--- a/actions/deletenotice.php
+++ b/actions/deletenotice.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/disfavor.php b/actions/disfavor.php
index 67b16bfd3..25230ceac 100644
--- a/actions/disfavor.php
+++ b/actions/disfavor.php
@@ -29,7 +29,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/doc.php b/actions/doc.php
index 522441824..1adb9b075 100644
--- a/actions/doc.php
+++ b/actions/doc.php
@@ -29,7 +29,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/editgroup.php b/actions/editgroup.php
index ea317f365..62a629056 100644
--- a/actions/editgroup.php
+++ b/actions/editgroup.php
@@ -29,7 +29,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/emailsettings.php b/actions/emailsettings.php
index 8bd1c74c4..1b4d73bbf 100644
--- a/actions/emailsettings.php
+++ b/actions/emailsettings.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/facebookhome.php b/actions/facebookhome.php
index f9dc4523e..a54d22a47 100644
--- a/actions/facebookhome.php
+++ b/actions/facebookhome.php
@@ -17,7 +17,7 @@
  * along with this program.     If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) { exit(1); }
+if (!defined('STATUSNET')) { exit(1); }
 
 require_once INSTALLDIR.'/lib/facebookaction.php';
 
diff --git a/actions/facebookinvite.php b/actions/facebookinvite.php
index 5bd03e99a..aa8486585 100644
--- a/actions/facebookinvite.php
+++ b/actions/facebookinvite.php
@@ -17,7 +17,7 @@
  * along with this program.     If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/facebooklogin.php b/actions/facebooklogin.php
index c4b14e75f..64d24dd40 100644
--- a/actions/facebooklogin.php
+++ b/actions/facebooklogin.php
@@ -17,7 +17,7 @@
  * along with this program.     If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) { exit(1); }
+if (!defined('STATUSNET')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/facebookaction.php');
 
diff --git a/actions/facebookremove.php b/actions/facebookremove.php
index aa492dbc4..1547fb780 100644
--- a/actions/facebookremove.php
+++ b/actions/facebookremove.php
@@ -17,7 +17,7 @@
  * along with this program.     If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) { exit(1); }
+if (!defined('STATUSNET')) { exit(1); }
 
 require_once INSTALLDIR.'/lib/facebookaction.php';
 
diff --git a/actions/facebooksettings.php b/actions/facebooksettings.php
index 310179967..817a11828 100644
--- a/actions/facebooksettings.php
+++ b/actions/facebooksettings.php
@@ -17,7 +17,7 @@
  * along with this program.     If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) { exit(1); }
+if (!defined('STATUSNET')) { exit(1); }
 
 require_once INSTALLDIR.'/lib/facebookaction.php';
 
diff --git a/actions/favor.php b/actions/favor.php
index 17d0d9d17..a995188c3 100644
--- a/actions/favor.php
+++ b/actions/favor.php
@@ -29,7 +29,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/favorited.php b/actions/favorited.php
index 445c30767..006dd5488 100644
--- a/actions/favorited.php
+++ b/actions/favorited.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/favoritesrss.php b/actions/favoritesrss.php
index 0c6c4b8f9..0302d10e5 100644
--- a/actions/favoritesrss.php
+++ b/actions/favoritesrss.php
@@ -29,7 +29,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/featured.php b/actions/featured.php
index ac1912ba3..f38068eb6 100644
--- a/actions/featured.php
+++ b/actions/featured.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/file.php b/actions/file.php
index a8ff547f8..005a13169 100644
--- a/actions/file.php
+++ b/actions/file.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) { exit(1); }
+if (!defined('STATUSNET')) { exit(1); }
 
 require_once(INSTALLDIR.'/actions/shownotice.php');
 
diff --git a/actions/finishaddopenid.php b/actions/finishaddopenid.php
index f8d88587d..40939d44b 100644
--- a/actions/finishaddopenid.php
+++ b/actions/finishaddopenid.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/finishopenidlogin.php b/actions/finishopenidlogin.php
index 37aba87f0..07da72fc0 100644
--- a/actions/finishopenidlogin.php
+++ b/actions/finishopenidlogin.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) { exit(1); }
+if (!defined('STATUSNET')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/openid.php');
 
diff --git a/actions/finishremotesubscribe.php b/actions/finishremotesubscribe.php
index bd6dbf2a6..5df36070f 100644
--- a/actions/finishremotesubscribe.php
+++ b/actions/finishremotesubscribe.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) { exit(1); }
+if (!defined('STATUSNET')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/omb.php');
 
@@ -284,7 +284,7 @@ class FinishremotesubscribeAction extends Action
         $fetcher = Auth_Yadis_Yadis::getHTTPFetcher();
         $result = $fetcher->post($req->get_normalized_http_url(),
                                  $req->to_postdata(),
-                                 array('User-Agent: StatusNet/' . LACONICA_VERSION));
+                                 array('User-Agent: StatusNet/' . STATUSNET_VERSION));
 
         common_debug('got result: "'.print_r($result,true).'"', __FILE__);
 
diff --git a/actions/foaf.php b/actions/foaf.php
index 66086b6a4..d3ab098f4 100644
--- a/actions/foaf.php
+++ b/actions/foaf.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) { exit(1); }
+if (!defined('STATUSNET')) { exit(1); }
 
 define('LISTENER', 1);
 define('LISTENEE', -1);
diff --git a/actions/groupblock.php b/actions/groupblock.php
index 7735e2dcf..e98f13224 100644
--- a/actions/groupblock.php
+++ b/actions/groupblock.php
@@ -27,7 +27,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/groupbyid.php b/actions/groupbyid.php
index 8775676f7..bc0709f4f 100644
--- a/actions/groupbyid.php
+++ b/actions/groupbyid.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/groupdesignsettings.php b/actions/groupdesignsettings.php
index aae4ae865..baef31018 100644
--- a/actions/groupdesignsettings.php
+++ b/actions/groupdesignsettings.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/grouplogo.php b/actions/grouplogo.php
index f9354d458..30f865248 100644
--- a/actions/grouplogo.php
+++ b/actions/grouplogo.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/groupmembers.php b/actions/groupmembers.php
index 265d2ca0e..5a4ea27ab 100644
--- a/actions/groupmembers.php
+++ b/actions/groupmembers.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/grouprss.php b/actions/grouprss.php
index ad6094032..7cd85c1af 100644
--- a/actions/grouprss.php
+++ b/actions/grouprss.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/groups.php b/actions/groups.php
index 09216e613..53b95c848 100644
--- a/actions/groups.php
+++ b/actions/groups.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/groupsearch.php b/actions/groupsearch.php
index a7004366f..fc825a6fd 100644
--- a/actions/groupsearch.php
+++ b/actions/groupsearch.php
@@ -28,7 +28,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/groupunblock.php b/actions/groupunblock.php
index 45d70841c..248b2a0a7 100644
--- a/actions/groupunblock.php
+++ b/actions/groupunblock.php
@@ -27,7 +27,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/imsettings.php b/actions/imsettings.php
index 3e89b6f66..145cd7ed2 100644
--- a/actions/imsettings.php
+++ b/actions/imsettings.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/inbox.php b/actions/inbox.php
index 757461fe8..f5f7d8bcb 100644
--- a/actions/inbox.php
+++ b/actions/inbox.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/invite.php b/actions/invite.php
index 64a2061c3..d8f15705b 100644
--- a/actions/invite.php
+++ b/actions/invite.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) { exit(1); }
+if (!defined('STATUSNET')) { exit(1); }
 
 class InviteAction extends CurrentUserDesignAction
 {
diff --git a/actions/joingroup.php b/actions/joingroup.php
index bf19a2ad9..32b59efa0 100644
--- a/actions/joingroup.php
+++ b/actions/joingroup.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/leavegroup.php b/actions/leavegroup.php
index 347440ed6..27b5ea017 100644
--- a/actions/leavegroup.php
+++ b/actions/leavegroup.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/login.php b/actions/login.php
index 020f5ea63..145236966 100644
--- a/actions/login.php
+++ b/actions/login.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/logout.php b/actions/logout.php
index 6e147ccc0..eda5cefe5 100644
--- a/actions/logout.php
+++ b/actions/logout.php
@@ -28,7 +28,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/makeadmin.php b/actions/makeadmin.php
index 7ab41fa6e..7866f42c1 100644
--- a/actions/makeadmin.php
+++ b/actions/makeadmin.php
@@ -27,7 +27,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/microsummary.php b/actions/microsummary.php
index 585ef788a..8f2d34998 100644
--- a/actions/microsummary.php
+++ b/actions/microsummary.php
@@ -28,7 +28,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/newgroup.php b/actions/newgroup.php
index f16c25f1a..544dd3818 100644
--- a/actions/newgroup.php
+++ b/actions/newgroup.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/newmessage.php b/actions/newmessage.php
index 9ca3e66e1..579871546 100644
--- a/actions/newmessage.php
+++ b/actions/newmessage.php
@@ -29,7 +29,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/newnotice.php b/actions/newnotice.php
index bc1b7b06a..4b542815b 100644
--- a/actions/newnotice.php
+++ b/actions/newnotice.php
@@ -29,7 +29,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/noticesearch.php b/actions/noticesearch.php
index fc849f4dc..e268c69ab 100644
--- a/actions/noticesearch.php
+++ b/actions/noticesearch.php
@@ -29,7 +29,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/noticesearchrss.php b/actions/noticesearchrss.php
index a1d36ff56..67bca01b5 100644
--- a/actions/noticesearchrss.php
+++ b/actions/noticesearchrss.php
@@ -28,7 +28,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/nudge.php b/actions/nudge.php
index 58ec0cbc0..b699a3144 100644
--- a/actions/nudge.php
+++ b/actions/nudge.php
@@ -29,7 +29,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/oembed.php b/actions/oembed.php
index 3940a4db4..5f6751b5a 100644
--- a/actions/oembed.php
+++ b/actions/oembed.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/openidlogin.php b/actions/openidlogin.php
index 813808523..42d740938 100644
--- a/actions/openidlogin.php
+++ b/actions/openidlogin.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) { exit(1); }
+if (!defined('STATUSNET')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/openid.php');
 
diff --git a/actions/openidsettings.php b/actions/openidsettings.php
index 581254651..09e678e3c 100644
--- a/actions/openidsettings.php
+++ b/actions/openidsettings.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/opensearch.php b/actions/opensearch.php
index 81efcea9b..8ef13dd7a 100644
--- a/actions/opensearch.php
+++ b/actions/opensearch.php
@@ -29,7 +29,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/othersettings.php b/actions/othersettings.php
index 3953bbb88..244c34eab 100644
--- a/actions/othersettings.php
+++ b/actions/othersettings.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/outbox.php b/actions/outbox.php
index 726934ae6..a1fc81dfd 100644
--- a/actions/outbox.php
+++ b/actions/outbox.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/passwordsettings.php b/actions/passwordsettings.php
index 43188030f..e7cd0ab51 100644
--- a/actions/passwordsettings.php
+++ b/actions/passwordsettings.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/peoplesearch.php b/actions/peoplesearch.php
index e083faf62..43c966f9c 100644
--- a/actions/peoplesearch.php
+++ b/actions/peoplesearch.php
@@ -28,7 +28,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/peopletag.php b/actions/peopletag.php
index bf15e1e2e..0c5321fae 100644
--- a/actions/peopletag.php
+++ b/actions/peopletag.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/postnotice.php b/actions/postnotice.php
index ab8d4339b..883cd53fb 100644
--- a/actions/postnotice.php
+++ b/actions/postnotice.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) { exit(1); }
+if (!defined('STATUSNET')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/omb.php');
 
diff --git a/actions/profilesettings.php b/actions/profilesettings.php
index 013e3ac82..2f9d2bac9 100644
--- a/actions/profilesettings.php
+++ b/actions/profilesettings.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/public.php b/actions/public.php
index 4ea48a2ff..f8ecc0e78 100644
--- a/actions/public.php
+++ b/actions/public.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/publicrss.php b/actions/publicrss.php
index 55ef3c66b..0d75ffc35 100644
--- a/actions/publicrss.php
+++ b/actions/publicrss.php
@@ -29,7 +29,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/publictagcloud.php b/actions/publictagcloud.php
index de987184b..026827fbe 100644
--- a/actions/publictagcloud.php
+++ b/actions/publictagcloud.php
@@ -29,7 +29,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) { exit(1); }
+if (!defined('STATUSNET')) { exit(1); }
 
 define('TAGS_PER_PAGE', 100);
 
diff --git a/actions/publicxrds.php b/actions/publicxrds.php
index afc5463d3..921106a5f 100644
--- a/actions/publicxrds.php
+++ b/actions/publicxrds.php
@@ -29,7 +29,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/recoverpassword.php b/actions/recoverpassword.php
index a68a05996..279f1cef1 100644
--- a/actions/recoverpassword.php
+++ b/actions/recoverpassword.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) { exit(1); }
+if (!defined('STATUSNET')) { exit(1); }
 
 # You have 24 hours to claim your password
 
diff --git a/actions/register.php b/actions/register.php
index 35c1ddd4b..a219c03d8 100644
--- a/actions/register.php
+++ b/actions/register.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/remotesubscribe.php b/actions/remotesubscribe.php
index d0d5a0384..793275781 100644
--- a/actions/remotesubscribe.php
+++ b/actions/remotesubscribe.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) { exit(1); }
+if (!defined('STATUSNET')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/omb.php');
 
@@ -323,7 +323,7 @@ class RemotesubscribeAction extends Action
 
         $result = $fetcher->post($req->get_normalized_http_url(),
                                  $req->to_postdata(),
-                                 array('User-Agent: StatusNet/' . LACONICA_VERSION));
+                                 array('User-Agent: StatusNet/' . STATUSNET_VERSION));
         if ($result->status != 200) {
             return null;
         }
diff --git a/actions/replies.php b/actions/replies.php
index 37c1f33e6..954d7ce19 100644
--- a/actions/replies.php
+++ b/actions/replies.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/repliesrss.php b/actions/repliesrss.php
index 35a77fab8..5115453b7 100644
--- a/actions/repliesrss.php
+++ b/actions/repliesrss.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) { exit(1); }
+if (!defined('STATUSNET')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/rssaction.php');
 
diff --git a/actions/requesttoken.php b/actions/requesttoken.php
index 1ece3e6b0..243844c4b 100644
--- a/actions/requesttoken.php
+++ b/actions/requesttoken.php
@@ -29,7 +29,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/showfavorites.php b/actions/showfavorites.php
index 41178c5a9..9734496ba 100644
--- a/actions/showfavorites.php
+++ b/actions/showfavorites.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/showgroup.php b/actions/showgroup.php
index ed980233a..965b933e2 100644
--- a/actions/showgroup.php
+++ b/actions/showgroup.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/showmessage.php b/actions/showmessage.php
index 522fec490..5d23fb13f 100644
--- a/actions/showmessage.php
+++ b/actions/showmessage.php
@@ -26,7 +26,7 @@
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
  */
-if (!defined('LACONICA')) { 
+if (!defined('STATUSNET')) { 
     exit(1); 
 }
 
diff --git a/actions/shownotice.php b/actions/shownotice.php
index 92911effb..4f7c3af7f 100644
--- a/actions/shownotice.php
+++ b/actions/shownotice.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/showstream.php b/actions/showstream.php
index 76482e97a..93730812c 100644
--- a/actions/showstream.php
+++ b/actions/showstream.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/smssettings.php b/actions/smssettings.php
index 587cf7d58..bfe49feee 100644
--- a/actions/smssettings.php
+++ b/actions/smssettings.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/subedit.php b/actions/subedit.php
index 853ac12a2..3320bdc59 100644
--- a/actions/subedit.php
+++ b/actions/subedit.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) { exit(1); }
+if (!defined('STATUSNET')) { exit(1); }
 
 class SubeditAction extends Action
 {
diff --git a/actions/subscribe.php b/actions/subscribe.php
index aa701637b..fb1fb5e6b 100644
--- a/actions/subscribe.php
+++ b/actions/subscribe.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) { exit(1); }
+if (!defined('STATUSNET')) { exit(1); }
 
 class SubscribeAction extends Action
 {
diff --git a/actions/subscribers.php b/actions/subscribers.php
index 66a531c3f..3000f17b0 100644
--- a/actions/subscribers.php
+++ b/actions/subscribers.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/subscriptions.php b/actions/subscriptions.php
index 656dea688..8cad9e3b4 100644
--- a/actions/subscriptions.php
+++ b/actions/subscriptions.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
@@ -42,7 +42,7 @@ if (!defined('LACONICA')) {
  * @link     http://status.net/
  */
 
-if (!defined('LACONICA')) { exit(1); }
+if (!defined('STATUSNET')) { exit(1); }
 
 class SubscriptionsAction extends GalleryAction
 {
diff --git a/actions/sup.php b/actions/sup.php
index 46fdc1857..b635de194 100644
--- a/actions/sup.php
+++ b/actions/sup.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) { exit(1); }
+if (!defined('STATUSNET')) { exit(1); }
 
 class SupAction extends Action
 {
diff --git a/actions/tag.php b/actions/tag.php
index fd29942a2..935d00ab0 100644
--- a/actions/tag.php
+++ b/actions/tag.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) { exit(1); }
+if (!defined('STATUSNET')) { exit(1); }
 
 class TagAction extends Action
 {
diff --git a/actions/tagother.php b/actions/tagother.php
index 8f3ab7f65..aaca46355 100644
--- a/actions/tagother.php
+++ b/actions/tagother.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) { exit(1); }
+if (!defined('STATUSNET')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/settingsaction.php');
 
diff --git a/actions/tagrss.php b/actions/tagrss.php
index 00746257e..135b12135 100644
--- a/actions/tagrss.php
+++ b/actions/tagrss.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) { exit(1); }
+if (!defined('STATUSNET')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/rssaction.php');
 
diff --git a/actions/twitapiaccount.php b/actions/twitapiaccount.php
index 505f893ae..dc043ddd3 100644
--- a/actions/twitapiaccount.php
+++ b/actions/twitapiaccount.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/twitapiblocks.php b/actions/twitapiblocks.php
index 10b97367e..808e79220 100644
--- a/actions/twitapiblocks.php
+++ b/actions/twitapiblocks.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/twitapidirect_messages.php b/actions/twitapidirect_messages.php
index 70e3ef64e..8511fcbe2 100644
--- a/actions/twitapidirect_messages.php
+++ b/actions/twitapidirect_messages.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/twitapifavorites.php b/actions/twitapifavorites.php
index 243a40e65..d812b5034 100644
--- a/actions/twitapifavorites.php
+++ b/actions/twitapifavorites.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/twitapifriendships.php b/actions/twitapifriendships.php
index b730edcdf..015a5dbae 100644
--- a/actions/twitapifriendships.php
+++ b/actions/twitapifriendships.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/twitapigroups.php b/actions/twitapigroups.php
index f39975237..4d2388919 100644
--- a/actions/twitapigroups.php
+++ b/actions/twitapigroups.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/twitapihelp.php b/actions/twitapihelp.php
index ef8f6be93..3fc232f64 100644
--- a/actions/twitapihelp.php
+++ b/actions/twitapihelp.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/twitapinotifications.php b/actions/twitapinotifications.php
index 80da040e0..7bc9dd14b 100644
--- a/actions/twitapinotifications.php
+++ b/actions/twitapinotifications.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) { exit(1); }
+if (!defined('STATUSNET')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/twitterapi.php');
 
diff --git a/actions/twitapisearchatom.php b/actions/twitapisearchatom.php
index 5ecec9684..d3e17650d 100644
--- a/actions/twitapisearchatom.php
+++ b/actions/twitapisearchatom.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/twitapisearchjson.php b/actions/twitapisearchjson.php
index 73735c5b5..173295176 100644
--- a/actions/twitapisearchjson.php
+++ b/actions/twitapisearchjson.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/twitapistatuses.php b/actions/twitapistatuses.php
index 4a9f4a5e5..e522b6357 100644
--- a/actions/twitapistatuses.php
+++ b/actions/twitapistatuses.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/twitapistatusnet.php b/actions/twitapistatusnet.php
index ff159f207..a36c162d9 100644
--- a/actions/twitapistatusnet.php
+++ b/actions/twitapistatusnet.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
@@ -70,12 +70,12 @@ class TwitapilaconicaAction extends TwitterapiAction
         switch ($apidata['content-type']) {
          case 'xml':
             $this->init_document('xml');
-            $this->element('version', null, LACONICA_VERSION);
+            $this->element('version', null, STATUSNET_VERSION);
             $this->end_document('xml');
             break;
          case 'json':
             $this->init_document('json');
-            print '"'.LACONICA_VERSION.'"';
+            print '"'.STATUSNET_VERSION.'"';
             $this->end_document('json');
             break;
          default:
diff --git a/actions/twitapitags.php b/actions/twitapitags.php
index 9ed9970a3..f889ae8c0 100644
--- a/actions/twitapitags.php
+++ b/actions/twitapitags.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/twitapitrends.php b/actions/twitapitrends.php
index f76601768..436451c0f 100644
--- a/actions/twitapitrends.php
+++ b/actions/twitapitrends.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/twitapiusers.php b/actions/twitapiusers.php
index c28a37ab7..853a6b8fa 100644
--- a/actions/twitapiusers.php
+++ b/actions/twitapiusers.php
@@ -17,7 +17,7 @@
  * along with this program.     If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/twitterauthorization.php b/actions/twitterauthorization.php
index 1861c1fcb..3745a67cf 100644
--- a/actions/twitterauthorization.php
+++ b/actions/twitterauthorization.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/twittersettings.php b/actions/twittersettings.php
index 389097667..c23fa2ff8 100644
--- a/actions/twittersettings.php
+++ b/actions/twittersettings.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/unblock.php b/actions/unblock.php
index e4dbf4ca7..43f454340 100644
--- a/actions/unblock.php
+++ b/actions/unblock.php
@@ -28,7 +28,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/unsubscribe.php b/actions/unsubscribe.php
index 91d06cfa6..bedea9f28 100644
--- a/actions/unsubscribe.php
+++ b/actions/unsubscribe.php
@@ -28,7 +28,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/updateprofile.php b/actions/updateprofile.php
index b31a6d14c..d48686401 100644
--- a/actions/updateprofile.php
+++ b/actions/updateprofile.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) { exit(1); }
+if (!defined('STATUSNET')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/omb.php');
 
diff --git a/actions/userauthorization.php b/actions/userauthorization.php
index 3c099b8f6..38329a2c7 100644
--- a/actions/userauthorization.php
+++ b/actions/userauthorization.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) { exit(1); }
+if (!defined('STATUSNET')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/omb.php');
 define('TIMESTAMP_THRESHOLD', 300);
diff --git a/actions/userbyid.php b/actions/userbyid.php
index 5fa929a93..4ed78688b 100644
--- a/actions/userbyid.php
+++ b/actions/userbyid.php
@@ -29,7 +29,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/userdesignsettings.php b/actions/userdesignsettings.php
index 312ca1150..07d160984 100644
--- a/actions/userdesignsettings.php
+++ b/actions/userdesignsettings.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/usergroups.php b/actions/usergroups.php
index fa7068a3b..7cdc132b8 100644
--- a/actions/usergroups.php
+++ b/actions/usergroups.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/userrss.php b/actions/userrss.php
index 20e65b083..1437a4c22 100644
--- a/actions/userrss.php
+++ b/actions/userrss.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) { exit(1); }
+if (!defined('STATUSNET')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/rssaction.php');
 
diff --git a/actions/xrds.php b/actions/xrds.php
index ef1ebaed0..86f7d7616 100644
--- a/actions/xrds.php
+++ b/actions/xrds.php
@@ -29,7 +29,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }