diff --git a/.todo b/.todo
index 254fcb9..66fc68c 100644
--- a/.todo
+++ b/.todo
@@ -1,4 +1,3 @@
-- rename CCylinder to Capsule
 - add plane constructor taking 4 parameters for (a,b,c,d)
 - support loading and applying textures for managed objects
 - debug hooks for loading and execution to halt infinite lua loops
diff --git a/Engine.cc b/Engine.cc
index 933a3aa..61eb78c 100644
--- a/Engine.cc
+++ b/Engine.cc
@@ -704,7 +704,7 @@ void Engine::Object::createManagedObject()
         case OdeWorld::CCYLINDER:
             while (m_args->size() < 8)
                 m_args->push_back(0);
-            m_ode_object->addCCylinder(m_args);
+            m_ode_object->addCapsule(m_args);
             break;
     }
     m_ode_object->finalize();
diff --git a/ag.cc b/ag.cc
index 6356267..60ed2ee 100644
--- a/ag.cc
+++ b/ag.cc
@@ -49,8 +49,8 @@ namespace ag
             { "createStaticPlane", createStaticPlane},
             { "createCylinder", createCylinder},
             { "createStaticCylinder", createStaticCylinder},
-            { "createCCylinder", createCCylinder},
-            { "createStaticCCylinder", createStaticCCylinder},
+            { "createCapsule", createCapsule},
+            { "createStaticCapsule", createStaticCapsule},
 
             { NULL, NULL }
         };
@@ -413,7 +413,7 @@ namespace ag
         return createCylinderSpecify(L, true);
     }
 
-    static int createCCylinderSpecify(lua_State * L, bool is_static)
+    static int createCapsuleSpecify(lua_State * L, bool is_static)
     {
         int argc = lua_gettop(L);
         if (argc == 2 && lua_isnumber(L, 1) && lua_isnumber(L, 2))
@@ -428,14 +428,14 @@ namespace ag
         return 1;
     }
 
-    int createCCylinder(lua_State * L)
+    int createCapsule(lua_State * L)
     {
-        return createCCylinderSpecify(L, false);
+        return createCapsuleSpecify(L, false);
     }
 
-    int createStaticCCylinder(lua_State * L)
+    int createStaticCapsule(lua_State * L)
     {
-        return createCCylinderSpecify(L, true);
+        return createCapsuleSpecify(L, true);
     }
 
     namespace object
diff --git a/ag.h b/ag.h
index 760eb33..0c735cb 100644
--- a/ag.h
+++ b/ag.h
@@ -35,8 +35,8 @@ namespace ag
     int createStaticPlane(lua_State * L);
     int createCylinder(lua_State * L);
     int createStaticCylinder(lua_State * L);
-    int createCCylinder(lua_State * L);
-    int createStaticCCylinder(lua_State * L);
+    int createCapsule(lua_State * L);
+    int createStaticCapsule(lua_State * L);
 
     namespace object
     {
diff --git a/tests/managed_objects.lua b/tests/managed_objects.lua
index 376488a..55f8592 100644
--- a/tests/managed_objects.lua
+++ b/tests/managed_objects.lua
@@ -18,7 +18,7 @@ function key_down_event(key)
         cyl = ag.createCylinder(0.5, 1)
         init(cyl)
     elseif (key == "a") then
-        ccyl = ag.createCCylinder(0.5, 1)
+        ccyl = ag.createCapsule(0.5, 1)
         init(ccyl)
     elseif (key == "s") then
         sphere = ag.createSphere(0.8)