Index: ode.c
===================================================================
--- ode.c	(revision 1158)
+++ ode.c	(revision 1159)
@@ -9,7 +9,6 @@
 #include "index.h"
 #else
 #include "headers/ode.h"
-#include "ode.h"
 #endif
 
 // TODO:
@@ -1273,11 +1272,19 @@
 return raydium_ode_element_object_get(raydium_ode_element_find(e));
 }
 
-int raydium_ode_object_sphere_add(char *name, int group, dReal mass, dReal radius, signed char type, int tag, char *mesh)
+int raydium_ode_object_sphere_add(char *iname, int group, dReal mass, dReal radius, signed char type, int tag, char *mesh)
 {
 int i;
 dMass m;
+char name[RAYDIUM_MAX_NAME_LEN];
 
+if(iname==NULL)
+    raydium_ode_name_auto("Sphere",name);
+else if (iname[0]==0)
+    raydium_ode_name_auto("Sphere",name);
+else
+    strcpy(name,iname);
+
 if(raydium_ode_element_find(name)>=0)
     {
     raydium_log("ODE: Error: Cannot add element \"%s\": name already exists",name);
@@ -1344,12 +1351,20 @@
 
 }
 
-int raydium_ode_object_box_add(char *name, int group, dReal mass, dReal tx, dReal ty, dReal tz, signed char type, int tag, char *mesh)
+int raydium_ode_object_box_add(char *iname, int group, dReal mass, dReal tx, dReal ty, dReal tz, signed char type, int tag, char *mesh)
 {
 int i;
 dMass m;
 dReal sizes[3];
+char name[RAYDIUM_MAX_NAME_LEN];
 
+if(iname==NULL)
+    raydium_ode_name_auto("Box",name);
+else if (iname[0]==0)
+    raydium_ode_name_auto("Box",name);
+else
+    strcpy(name,iname);
+
 if(raydium_ode_element_find(name)>=0)
     {
     raydium_log("ODE: Cannot add element \"%s\": name already exists",name);
@@ -1425,12 +1440,20 @@
 
 }
 
-int raydium_ode_object_capsule_add(char *name, int group, dReal mass, dReal radius, dReal length, signed char type, int tag, char *mesh)
+int raydium_ode_object_capsule_add(char *iname, int group, dReal mass, dReal radius, dReal length, signed char type, int tag, char *mesh)
 {
 int i;
 dMass m;
 dReal sizes[3];
+char name[RAYDIUM_MAX_NAME_LEN];
 
+if(iname==NULL)
+    raydium_ode_name_auto("Capsule",name);
+else if (iname[0]==0)
+    raydium_ode_name_auto("Capsule",name);
+else
+    strcpy(name,iname);
+
 if(raydium_ode_element_find(name)>=0)
     {
     raydium_log("ODE: Cannot add element \"%s\": name already exists",name);