diff --git a/includes/class-wp-push-syndication-server.php b/includes/class-wp-push-syndication-server.php
index b3ea10863bb1fd5d430797b736c9848559f64283..b8cf922c532470b896be937c71474e5064dd50ba 100644
--- a/includes/class-wp-push-syndication-server.php
+++ b/includes/class-wp-push-syndication-server.php
@@ -9,7 +9,7 @@
 
 require_once( dirname( __FILE__ ) . '/includes/class-wp-client-factory.php' );
 
-class Push_Syndication_Server {
+class WP_Push_Syndication_Server {
 
     private $push_syndicate_settings;
     private $push_syndicate_tranports;
diff --git a/push-syndication-server.php b/push-syndication-server.php
index 2255ee7232fe10718e48b8bec9ab8a140c4510af..c02ae13fc47900e2849928336015393f287f2ca0 100644
--- a/push-syndication-server.php
+++ b/push-syndication-server.php
@@ -12,7 +12,14 @@ License:      GPLv2 or later
 
 **************************************************************************/
 
+require_once ( dirname( __FILE__ ) . '/includes/class-wpcom-push-syndication-server.php' );
+require_once ( dirname( __FILE__ ) . '/includes/class-wp-push-syndication-server.php' );
 
-$Push_Syndication_Server = new Push_Syndication_Server();
+
+if ( !defined( 'PUSH_SYNDICATION_ENVIRONMENT' ) )
+    define( 'PUSH_SYNDICATION_ENVIRONMENT', 'WP' );
+
+$push_syndication_server_class = PUSH_SYNDICATION_ENVIRONMENT . 'Push_Syndication_Server';
+$push_syndication_server = new $push_syndication_server_class();
 
 ?>