diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4429fb3..2a7c4f8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 2.8.3)
-project(jammi)
+project(roscloud)
 
 find_package(catkin REQUIRED COMPONENTS
   rospy
@@ -8,7 +8,7 @@ find_package(catkin REQUIRED COMPONENTS
 
 catkin_package(
 #  INCLUDE_DIRS include
-#  LIBRARIES jammi
+#  LIBRARIES roscloud
 #  CATKIN_DEPENDS rospy std_msgs
 #  DEPENDS system_lib
 )
diff --git a/launch/bar.launch b/launch/bar.launch
deleted file mode 100644
index 1773872..0000000
--- a/launch/bar.launch
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0"?>
-<launch>
-    <node pkg="jammi" type="client_node.py" name="bar_client_node" output="screen">
-        <param name="name" value="bar"/>
-        <param name="host" value="localhost"/>
-        <param name="port" value="9000"/>
-    </node>
-
-</launch>
diff --git a/launch/example.launch b/launch/example.launch
index 9fcce05..7fbaac8 100644
--- a/launch/example.launch
+++ b/launch/example.launch
@@ -1,24 +1,24 @@
 <?xml version="1.0"?>
 <launch>
-    <node pkg="jammi" type="client_node.py" name="foo_client_node" output="screen">
+    <node pkg="roscloud" type="client_node.py" name="foo_client_node" output="screen">
         <param name="name" value="foo"/>
         <param name="host" value="wallar.me"/>
         <param name="port" value="9000"/>
     </node>
 
-    <node pkg="jammi" type="client_node.py" name="bar_client_node" output="screen">
+    <node pkg="roscloud" type="client_node.py" name="bar_client_node" output="screen">
         <param name="name" value="bar"/>
         <param name="host" value="wallar.me"/>
         <param name="port" value="9000"/>
     </node>
 
-    <node pkg="jammi" type="client_node.py" name="baz_client_node" output="screen">
+    <node pkg="roscloud" type="client_node.py" name="baz_client_node" output="screen">
         <param name="name" value="baz"/>
         <param name="host" value="wallar.me"/>
         <param name="port" value="9000"/>
     </node>
 
-    <node pkg="jammi" type="client_node.py" name="qux_client_node" output="screen">
+    <node pkg="roscloud" type="client_node.py" name="qux_client_node" output="screen">
         <param name="name" value="qux"/>
         <param name="host" value="wallar.me"/>
         <param name="port" value="9000"/>
diff --git a/launch/foo.launch b/launch/foo.launch
deleted file mode 100644
index e2e6a47..0000000
--- a/launch/foo.launch
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0"?>
-<launch>
-    <node pkg="jammi" type="client_node.py" name="foo_client_node" output="screen">
-        <param name="name" value="foo"/>
-        <param name="host" value="localhost"/>
-        <param name="port" value="9000"/>
-        <rosparam>
-            publishing: 
-                - /state
-            types:
-                - geometry_msgs/Point
-            trusted:
-                - /bar /baz
-        </rosparam>
-    </node>
-
-    <node pkg="rostopic" type="rostopic" name="state_pub"
-        args="pub -r 100 /state geometry_msgs/Point '{x: 1, y: 1, z: 0}'"/>
-</launch>
diff --git a/launch/server.launch b/launch/server.launch
deleted file mode 100644
index 40808dc..0000000
--- a/launch/server.launch
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0"?>
-<launch>
-    <node pkg="jammi" type="server_node.py" name="jammi_server" output="screen">
-        <param name="host" value="wallar.me"/>
-        <param name="port" value="9000"/>
-    </node>
-
-</launch>
diff --git a/package.xml b/package.xml
index 3a5306c..844428b 100644
--- a/package.xml
+++ b/package.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0"?>
 <package>
-  <name>jammi</name>
+  <name>roscloud</name>
   <version>0.0.1</version>
-  <description>Just Another Multi-Master Implementation</description>
+  <description>ROS Cloud Robotics Framework</description>
   <maintainer email="wallar@mit.edu">Alex Wallar</maintainer>
   <license>GPLv3</license>
-  <url type="website">http://github.com/wallarelvo/jammi</url>
+  <url type="website">http://github.com/roscloud/roscloud_client</url>
   <buildtool_depend>catkin</buildtool_depend>
   <build_depend>rospy</build_depend>
   <build_depend>std_msgs</build_depend>
diff --git a/scripts/run_server.py b/scripts/run_server.py
deleted file mode 100644
index e2b1756..0000000
--- a/scripts/run_server.py
+++ /dev/null
@@ -1,22 +0,0 @@
-
-import os
-import sys
-
-sys.path.append(os.path.join(os.path.dirname(__file__), "../src"))
-
-import server
-from twisted.python import log
-from twisted.internet import reactor
-from autobahn.twisted.websocket import WebSocketServerFactory
-
-
-def run_server():
-    log.startLogging(sys.stdout)
-    factory = WebSocketServerFactory("ws://localhost:9000", debug=True)
-    factory.protocol = server.MMServerProtocol
-    reactor.listenTCP(9000, factory)
-    reactor.run()
-
-
-if __name__ == "__main__":
-    run_server()
diff --git a/src/client_node.py b/src/client_node.py
index 969d8d0..8afe286 100755
--- a/src/client_node.py
+++ b/src/client_node.py
@@ -7,7 +7,7 @@
 from connection import Connection
 
 
-NODE_NAME = "jammi_client"
+NODE_NAME = "roscloud_client"
 
 
 class JammiNode(object):