diff --git a/debug.cpp b/debug.cpp
index b867660..e0a0b5e 100644
--- a/debug.cpp
+++ b/debug.cpp
@@ -59,16 +59,16 @@ lutok::debug::~debug(void)
 /// Wrapper around lua_getinfo.
 ///
 /// \param s The Lua state.
-/// \param what The second parameter to lua_getinfo.
+/// \param what_ The second parameter to lua_getinfo.
 ///
 /// \warning Terminates execution if there is not enough memory to manipulate
 /// the Lua stack.
 void
-lutok::debug::get_info(state& s, const std::string& what)
+lutok::debug::get_info(state& s, const std::string& what_)
 {
     lua_State* raw_state = state_c_gate(s).c_state();
 
-    if (lua_getinfo(raw_state, what.c_str(), &_pimpl->lua_debug) == 0)
+    if (lua_getinfo(raw_state, what_.c_str(), &_pimpl->lua_debug) == 0)
         throw lutok::api_error::from_stack(s, "lua_getinfo");
 }
 
diff --git a/state.cpp b/state.cpp
index 1b3f9ac..ce6ff15 100644
--- a/state.cpp
+++ b/state.cpp
@@ -250,9 +250,9 @@ lutok::state::state(void)
 /// Instances constructed using this method do NOT own the raw state.  This
 /// means that, on exit, the state will not be destroyed.
 ///
-/// \param raw_state The raw Lua state to wrap.
-lutok::state::state(void* raw_state) :
-    _pimpl(new impl(reinterpret_cast< lua_State* >(raw_state), false))
+/// \param raw_state_ The raw Lua state to wrap.
+lutok::state::state(void* raw_state_) :
+    _pimpl(new impl(reinterpret_cast< lua_State* >(raw_state_), false))
 {
 }