diff --git a/chaiscript/chaiscript_prelude.hpp b/chaiscript/chaiscript_prelude.hpp
index 9758b33..e3e8e64 100644
--- a/chaiscript/chaiscript_prelude.hpp
+++ b/chaiscript/chaiscript_prelude.hpp
@@ -15,7 +15,7 @@ def for_each(container, func) { \n\
 	var range = range(container); \n\
 	while (!range.empty()) { \n\
 		func(range.front()) \n\
-		range.popFront() \n\
+		range.pop_front() \n\
 	} \n\
 } \n\
 def map(container, func) { \n\
@@ -23,7 +23,7 @@ def map(container, func) { \n\
 	var range = range(container) \n\
 	while (!range.empty()) { \n\
 		retval.push_back(func(range.front())) \n\
-		range.popFront() \n\
+		range.pop_front() \n\
 	} \n\
 	return retval \n\
 } \n\
@@ -32,7 +32,7 @@ def reduce(container, func, initial) { \n\
   var range = range(container) \n\
 	while (!range.empty()) { \n\
 		retval = (func(range.front(), retval)) \n\
-		range.popFront() \n\
+		range.pop_front() \n\
 	} \n\
 	return retval \n\
 } \n\
@@ -41,11 +41,11 @@ def join(container, delim) { \n\
 	var range = range(container) \n\
 	if (!range.empty()) { \n\
 		retval += to_string(range.front()) \n\
-		range.popFront() \n\
+		range.pop_front() \n\
 		while (!range.empty()) { \n\
 			retval += delim \n\
 			retval += to_string(range.front()) \n\
-			range.popFront() \n\
+			range.pop_front() \n\
 		} \n\
 	} \n\
 	return retval \n\
diff --git a/dispatchkit/bootstrap_stl.hpp b/dispatchkit/bootstrap_stl.hpp
index 25d088c..62ed9a5 100644
--- a/dispatchkit/bootstrap_stl.hpp
+++ b/dispatchkit/bootstrap_stl.hpp
@@ -30,7 +30,7 @@ namespace dispatchkit
         return m_begin == m_end;
       }
 
-      void popFront()
+      void pop_front()
       {
         if (empty())
         {
@@ -63,7 +63,7 @@ namespace dispatchkit
 
 
       register_function(system, &Input_Range<ContainerType>::empty, "empty");
-      register_function(system, &Input_Range<ContainerType>::popFront, "popFront");
+      register_function(system, &Input_Range<ContainerType>::pop_front, "pop_front");
       register_function(system, &Input_Range<ContainerType>::front, "front");
     }