Index: /orxonox/trunk/src/keynames.cc
===================================================================
--- /orxonox/trunk/src/keynames.cc	(revision 3229)
+++ /orxonox/trunk/src/keynames.cc	(revision 3230)
@@ -20,5 +20,5 @@
 using namespace std;
 
-int buttonname_to_SDLB( char* name)
+int buttonnameToSDLB( char* name)
 {
 	if( !strcmp (name, "BUTTON_LEFT")) return SDL_BUTTON_LEFT;
@@ -30,5 +30,5 @@
 }
 
-char* SDLB_to_buttonname( int button)
+char* SDLBToButtonname( int button)
 {
 	if( button == SDL_BUTTON_LEFT) return "BUTTON_LEFT";
@@ -40,5 +40,5 @@
 }
 
-int keyname_to_SDLK( char* name)
+int keynameToSDLK( char* name)
 {
 	if( !strcmp (name, "BACKSPACE")) return SDLK_BACKSPACE;
@@ -178,5 +178,5 @@
 }
 
-char* SDLK_to_keyname( int key)
+char* SDLKToKeyname( int key)
 {
 	if( key == SDLK_BACKSPACE) return "BACKSPACE";
Index: /orxonox/trunk/src/keynames.h
===================================================================
--- /orxonox/trunk/src/keynames.h	(revision 3229)
+++ /orxonox/trunk/src/keynames.h	(revision 3230)
@@ -24,5 +24,5 @@
 	\return an int containing the SDL identifier of the mouse button or -1 if the button name is not valid
 */
-int buttonname_to_SDLB( char* name);
+int buttonnameToSDLB( char* name);
 
 /**
@@ -31,5 +31,5 @@
 	\return a pointer to a string containing the name of the mouse button
 */
-char* SDLB_to_buttonname( int button);
+char* SDLBToButtonname( int button);
 
 /**
@@ -38,5 +38,5 @@
 	\return the SDLK sym of the named key or -1 if the key name is not valid
 */
-int keyname_to_SDLK( char* name);
+int keynameToSDLK( char* name);
 
 /**
@@ -45,5 +45,5 @@
 	\return a pointer to a string containig the name of the key
 */
-char* SDLK_to_keyname( int key);
+char* SDLKToKeyname( int key);
 
 
Index: /orxonox/trunk/src/list_template.h
===================================================================
--- /orxonox/trunk/src/list_template.h	(revision 3229)
+++ /orxonox/trunk/src/list_template.h	(revision 3230)
@@ -47,11 +47,11 @@
   
   int add(T* obj, ADDMODE mode, bool bRef);
-  T* get_object();
-  ListTemplate<T>* get_next();
-  ListTemplate<T>* get_previous();
-  ListTemplate<T>* get_last();
-  ListTemplate<T>* get_first();
-  void set_next(ListTemplate<T>* ptr);
-  void set_prev(ListTemplate<T>* ptr);
+  T* getObject();
+  ListTemplate<T>* getNext();
+  ListTemplate<T>* getPrevious();
+  ListTemplate<T>* getLast();
+  ListTemplate<T>* getFirst();
+  void setNext(ListTemplate<T>* ptr);
+  void setPrev(ListTemplate<T>* ptr);
   int remove (T* obj, FINDMODE mode);
   int getSize();
@@ -101,6 +101,6 @@
   else
   {
-    if (prev != NULL) prev->set_next (next);
-    if (next != NULL) next->set_prev (prev);
+    if (prev != NULL) prev->setNext (next);
+    if (next != NULL) next->setPrev (prev);
     if (!bReference) delete object;
   }
@@ -131,10 +131,10 @@
     case LIST_ADD_NEXT:
       p = new ListTemplate<T>( obj, next, this, bRef);
-      if( next != NULL) next->set_prev (p);
+      if( next != NULL) next->setPrev (p);
       next = p;
       break;
     case LIST_ADD_PREV:
       p = new ListTemplate<T>( obj, this, prev, bRef);
-      if( prev != NULL) prev->set_next (p);
+      if( prev != NULL) prev->setNext (p);
       prev = p;
       break;
@@ -160,5 +160,5 @@
 */
 template<class T>
-ListTemplate<T>* ListTemplate<T>::get_next ()
+ListTemplate<T>* ListTemplate<T>::getNext ()
 {
   return next;
@@ -170,5 +170,5 @@
 */
 template<class T>
-ListTemplate<T>* ListTemplate<T>::get_previous ()
+ListTemplate<T>* ListTemplate<T>::getPrevious ()
 {
   return prev;
@@ -180,8 +180,8 @@
 */
 template<class T>
-ListTemplate<T>* ListTemplate<T>::get_last ()
+ListTemplate<T>* ListTemplate<T>::getLast ()
 {
   if (next == NULL) return this;
-  else return next->get_last();
+  else return next->getLast();
 }
 
@@ -191,8 +191,8 @@
 */
 template<class T>
-ListTemplate<T>* ListTemplate<T>::get_first ()
+ListTemplate<T>* ListTemplate<T>::getFirst ()
 {
   if (prev == NULL) return this;
-  else return prev->get_first();
+  else return prev->getFirst();
 }
 
@@ -221,5 +221,5 @@
         else
         {
-          if( prev->get_object() == obj)
+          if( prev->getObject() == obj)
           {
             delete prev;
@@ -235,5 +235,5 @@
         else
         {
-          if( next->get_object() == obj)
+          if( next->getObject() == obj)
           {
             delete next;
@@ -260,5 +260,5 @@
 */
 template<class T>
-void ListTemplate<T>::set_next (ListTemplate<T>* ptr)
+void ListTemplate<T>::setNext (ListTemplate<T>* ptr)
 {
   next = ptr;
@@ -272,5 +272,5 @@
 */
 template<class T>
-void ListTemplate<T>::set_prev (ListTemplate<T>* ptr)
+void ListTemplate<T>::setPrev (ListTemplate<T>* ptr)
 {
   prev = ptr;
@@ -282,5 +282,5 @@
 */
 template<class T>
-T* ListTemplate<T>::get_object()
+T* ListTemplate<T>::getObject()
 {
   return object;
