diff --git a/actions/api.php b/actions/api.php
index 2e7ed3558c..badd4a42ac 100644
--- a/actions/api.php
+++ b/actions/api.php
@@ -76,7 +76,7 @@ class ApiAction extends Action {
 	}
 	
 	function process_command() {		
-		$action = "api$this->api_action";
+		$action = "twitapi$this->api_action";
 		$actionfile = INSTALLDIR."/actions/$action.php";		
 		if (file_exists($actionfile)) {
 			require_once($actionfile);
diff --git a/actions/apiaccount.php b/actions/twitapiaccount.php
similarity index 96%
rename from actions/apiaccount.php
rename to actions/twitapiaccount.php
index 2be53122e1..93e0844c1f 100644
--- a/actions/apiaccount.php
+++ b/actions/twitapiaccount.php
@@ -21,7 +21,7 @@ if (!defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/twitterapi.php');
 
-class ApiaccountAction extends TwitterapiAction {
+class TwitapiaccountAction extends TwitterapiAction {
 
 	function verify_credentials($args, $apidata) {
 		parent::handle($args);
diff --git a/actions/apiblocks.php b/actions/twitapiblocks.php
similarity index 95%
rename from actions/apiblocks.php
rename to actions/twitapiblocks.php
index c9c7a00824..a498d2038d 100644
--- a/actions/apiblocks.php
+++ b/actions/twitapiblocks.php
@@ -21,7 +21,7 @@ if (!defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/twitterapi.php');
 
-class ApiblocksAction extends TwitterapiAction {
+class TwitapiblocksAction extends TwitterapiAction {
 
 	function create($args, $apidata) {
 		parent::handle($args);
diff --git a/actions/apidirect_messages.php b/actions/twitapidirect_messages.php
similarity index 96%
rename from actions/apidirect_messages.php
rename to actions/twitapidirect_messages.php
index 351a4bb291..e7f3e12666 100644
--- a/actions/apidirect_messages.php
+++ b/actions/twitapidirect_messages.php
@@ -21,7 +21,7 @@ if (!defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/twitterapi.php');
 
-class Apidirect_messagesAction extends TwitterapiAction {
+class Twitapidirect_messagesAction extends TwitterapiAction {
 
 	function direct_messages($args, $apidata) {
 		parent::handle($args);
diff --git a/actions/apifavorites.php b/actions/twitapifavorites.php
similarity index 95%
rename from actions/apifavorites.php
rename to actions/twitapifavorites.php
index db8ad1062d..a4afa732a0 100644
--- a/actions/apifavorites.php
+++ b/actions/twitapifavorites.php
@@ -21,7 +21,7 @@ if (!defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/twitterapi.php');
 
-class ApifavoritesAction extends TwitterapiAction {
+class TwitapifavoritesAction extends TwitterapiAction {
 
 	function favorites($args, $apidata) {
 		parent::handle($args);
diff --git a/actions/apifriendships.php b/actions/twitapifriendships.php
similarity index 95%
rename from actions/apifriendships.php
rename to actions/twitapifriendships.php
index 4368f84d5e..e4888008b8 100644
--- a/actions/apifriendships.php
+++ b/actions/twitapifriendships.php
@@ -21,7 +21,7 @@ if (!defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/twitterapi.php');
 
-class ApifriendshipsAction extends TwitterapiAction {
+class TwitapifriendshipsAction extends TwitterapiAction {
 
 
 	function create($args, $apidata) {
diff --git a/actions/apihelp.php b/actions/twitapihelp.php
similarity index 96%
rename from actions/apihelp.php
rename to actions/twitapihelp.php
index 66a08c99a0..5a35d84423 100644
--- a/actions/apihelp.php
+++ b/actions/twitapihelp.php
@@ -21,7 +21,7 @@ if (!defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/twitterapi.php');
 
-class ApihelpAction extends TwitterapiAction {
+class TwitapihelpAction extends TwitterapiAction {
 
 	/* Returns the string "ok" in the requested format with a 200 OK HTTP status code.
 	 * URL:http://identi.ca/api/help/test.format
diff --git a/actions/apinotifications.php b/actions/twitapinotifications.php
similarity index 95%
rename from actions/apinotifications.php
rename to actions/twitapinotifications.php
index 98d96107d3..45a33427bc 100644
--- a/actions/apinotifications.php
+++ b/actions/twitapinotifications.php
@@ -22,7 +22,7 @@ if (!defined('LACONICA')) { exit(1); }
 require_once(INSTALLDIR.'/lib/twitterapi.php');
 
 # This naming convention looks real sick
-class ApinotificationsAction extends TwitterapiAction {
+class TwitapinotificationsAction extends TwitterapiAction {
 
 
 	function follow($args, $apidata) {
diff --git a/actions/apistatuses.php b/actions/twitapistatuses.php
similarity index 99%
rename from actions/apistatuses.php
rename to actions/twitapistatuses.php
index b438236439..7ac9167d31 100644
--- a/actions/apistatuses.php
+++ b/actions/twitapistatuses.php
@@ -25,7 +25,7 @@ require_once(INSTALLDIR.'/lib/twitterapi.php');
  * They are mostly in here for reference while I work on the
  * API. I'll fix things up to make them look better later. -- Zach 
  */
-class ApistatusesAction extends TwitterapiAction {
+class TwitapistatusesAction extends TwitterapiAction {
 	
 	/*
 	 *  Returns the 20 most recent statuses from non-protected users who have set a custom