diff --git a/lib/capybara/webkit/node.rb b/lib/capybara/webkit/node.rb
index 7a61cab..46d8d99 100644
--- a/lib/capybara/webkit/node.rb
+++ b/lib/capybara/webkit/node.rb
@@ -25,11 +25,11 @@ module Capybara::Webkit
     end
 
     def inner_html
-      invoke 'innerHTML'
+      invoke 'get_innerHTML'
     end
 
     def inner_html=(value)
-      invoke 'innerHTML', value
+      invoke 'set_innerHTML', value
     end
 
     def set(value)
diff --git a/src/capybara.js b/src/capybara.js
index dda77fb..b49f8e5 100644
--- a/src/capybara.js
+++ b/src/capybara.js
@@ -168,12 +168,12 @@ Capybara = {
     return this.nodes[index].value;
   },
 
-  innerHTML: function(index, value) {
-    if(value === undefined)
-      return this.nodes[index].innerHTML;
-    else
-      this.nodes[index].innerHTML = value;
+  get_innerHTML: function(index) {
+    return this.nodes[index].innerHTML;
+  },
 
+  set_innerHTML: function(index, value) {
+    this.nodes[index].innerHTML = value;
     return true;
   },