diff --git a/src/keyboard.c b/src/keyboard.c
index ff4a563..9b8679c 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -100,7 +100,7 @@ int l_keyboard_isDown(lua_State *L) {
 }
 
 
-int l_keyboard_getEvents(lua_State *L) {
+int l_keyboard_poll(lua_State *L) {
   lua_newtable(L);
   int idx = 1;
   while (keyboard_events.readi != keyboard_events.writei) {
@@ -120,7 +120,7 @@ int l_keyboard_getEvents(lua_State *L) {
 
 int luaopen_keyboard(lua_State *L) {
   luaL_Reg reg[] = {
-    { "getEvents",  l_keyboard_getEvents  },
+    { "poll",       l_keyboard_poll       },
     { "isDown",     l_keyboard_isDown     },
     { 0, 0 },
   };
diff --git a/src/main.c b/src/main.c
index bcf1c49..b55c7a6 100644
--- a/src/main.c
+++ b/src/main.c
@@ -65,8 +65,7 @@ int main(void) {
       "love.timer.step()\n"
       "while true do\n"
         /* Update mouse and handle mouse events */
-        "love.mouse.update()\n"
-        "for _, e in ipairs(love.mouse.getEvents()) do\n"
+        "for _, e in ipairs(love.mouse.poll()) do\n"
           "if e.type == 'motion' then\n"
             "if love.mousemoved then love.mousemoved(e.x, e.y, e.dx, e.dy) end\n"
           "elseif e.type == 'pressed' then\n"
@@ -76,7 +75,7 @@ int main(void) {
           "end\n"
         "end\n"
         /* Keyboard Events */
-        "for _, e in ipairs(love.keyboard.getEvents()) do\n"
+        "for _, e in ipairs(love.keyboard.poll()) do\n"
           "if e.type == 'down' then\n"
             "if love.keypressed then love.keypressed(e.code) end\n"
           "else\n"
diff --git a/src/mouse.c b/src/mouse.c
index 77e904b..2469c6d 100644
--- a/src/mouse.c
+++ b/src/mouse.c
@@ -110,13 +110,9 @@ int l_mouse_isDown(lua_State *L) {
 }
 
 
-int l_mouse_update(lua_State *L) {
+int l_mouse_poll(lua_State *L) {
   mouse_update();
-  return 0;
-}
 
-
-int l_mouse_getEvents(lua_State *L) {
   int i;
   int n = 1;
   lua_newtable(L);
@@ -159,8 +155,7 @@ int l_mouse_getEvents(lua_State *L) {
 
 int luaopen_mouse(lua_State *L) {
   luaL_Reg reg[] = {
-    { "update",       l_mouse_update        },
-    { "getEvents",    l_mouse_getEvents     },
+    { "poll",         l_mouse_poll          },
     { "getPosition",  l_mouse_getPosition   },
     { "getX",         l_mouse_getX          },
     { "getY",         l_mouse_getY          },