diff --git a/actionservice/ChangeLog b/actionwebservice/ChangeLog
similarity index 100%
rename from actionservice/ChangeLog
rename to actionwebservice/ChangeLog
diff --git a/actionservice/HACKING b/actionwebservice/HACKING
similarity index 100%
rename from actionservice/HACKING
rename to actionwebservice/HACKING
diff --git a/actionservice/MIT-LICENSE b/actionwebservice/MIT-LICENSE
similarity index 100%
rename from actionservice/MIT-LICENSE
rename to actionwebservice/MIT-LICENSE
diff --git a/actionservice/README b/actionwebservice/README
similarity index 100%
rename from actionservice/README
rename to actionwebservice/README
diff --git a/actionservice/Rakefile b/actionwebservice/Rakefile
similarity index 100%
rename from actionservice/Rakefile
rename to actionwebservice/Rakefile
diff --git a/actionservice/TODO b/actionwebservice/TODO
similarity index 100%
rename from actionservice/TODO
rename to actionwebservice/TODO
diff --git a/actionservice/examples/googlesearch/README b/actionwebservice/examples/googlesearch/README
similarity index 100%
rename from actionservice/examples/googlesearch/README
rename to actionwebservice/examples/googlesearch/README
diff --git a/actionservice/examples/googlesearch/autoloading/google_search_api.rb b/actionwebservice/examples/googlesearch/autoloading/google_search_api.rb
similarity index 100%
rename from actionservice/examples/googlesearch/autoloading/google_search_api.rb
rename to actionwebservice/examples/googlesearch/autoloading/google_search_api.rb
diff --git a/actionservice/examples/googlesearch/autoloading/google_search_controller.rb b/actionwebservice/examples/googlesearch/autoloading/google_search_controller.rb
similarity index 100%
rename from actionservice/examples/googlesearch/autoloading/google_search_controller.rb
rename to actionwebservice/examples/googlesearch/autoloading/google_search_controller.rb
diff --git a/actionservice/examples/googlesearch/delegated/google_search_service.rb b/actionwebservice/examples/googlesearch/delegated/google_search_service.rb
similarity index 100%
rename from actionservice/examples/googlesearch/delegated/google_search_service.rb
rename to actionwebservice/examples/googlesearch/delegated/google_search_service.rb
diff --git a/actionservice/examples/googlesearch/delegated/search_controller.rb b/actionwebservice/examples/googlesearch/delegated/search_controller.rb
similarity index 100%
rename from actionservice/examples/googlesearch/delegated/search_controller.rb
rename to actionwebservice/examples/googlesearch/delegated/search_controller.rb
diff --git a/actionservice/examples/googlesearch/direct/google_search_api.rb b/actionwebservice/examples/googlesearch/direct/google_search_api.rb
similarity index 100%
rename from actionservice/examples/googlesearch/direct/google_search_api.rb
rename to actionwebservice/examples/googlesearch/direct/google_search_api.rb
diff --git a/actionservice/examples/googlesearch/direct/search_controller.rb b/actionwebservice/examples/googlesearch/direct/search_controller.rb
similarity index 100%
rename from actionservice/examples/googlesearch/direct/search_controller.rb
rename to actionwebservice/examples/googlesearch/direct/search_controller.rb
diff --git a/actionservice/examples/metaWeblog/README b/actionwebservice/examples/metaWeblog/README
similarity index 100%
rename from actionservice/examples/metaWeblog/README
rename to actionwebservice/examples/metaWeblog/README
diff --git a/actionservice/examples/metaWeblog/blog_controller.rb b/actionwebservice/examples/metaWeblog/blog_controller.rb
similarity index 100%
rename from actionservice/examples/metaWeblog/blog_controller.rb
rename to actionwebservice/examples/metaWeblog/blog_controller.rb
diff --git a/actionservice/lib/action_service.rb b/actionwebservice/lib/action_service.rb
similarity index 100%
rename from actionservice/lib/action_service.rb
rename to actionwebservice/lib/action_service.rb
diff --git a/actionservice/lib/action_service/api.rb b/actionwebservice/lib/action_service/api.rb
similarity index 100%
rename from actionservice/lib/action_service/api.rb
rename to actionwebservice/lib/action_service/api.rb
diff --git a/actionservice/lib/action_service/api/abstract.rb b/actionwebservice/lib/action_service/api/abstract.rb
similarity index 100%
rename from actionservice/lib/action_service/api/abstract.rb
rename to actionwebservice/lib/action_service/api/abstract.rb
diff --git a/actionservice/lib/action_service/api/action_controller.rb b/actionwebservice/lib/action_service/api/action_controller.rb
similarity index 100%
rename from actionservice/lib/action_service/api/action_controller.rb
rename to actionwebservice/lib/action_service/api/action_controller.rb
diff --git a/actionservice/lib/action_service/base.rb b/actionwebservice/lib/action_service/base.rb
similarity index 100%
rename from actionservice/lib/action_service/base.rb
rename to actionwebservice/lib/action_service/base.rb
diff --git a/actionservice/lib/action_service/client.rb b/actionwebservice/lib/action_service/client.rb
similarity index 100%
rename from actionservice/lib/action_service/client.rb
rename to actionwebservice/lib/action_service/client.rb
diff --git a/actionservice/lib/action_service/client/base.rb b/actionwebservice/lib/action_service/client/base.rb
similarity index 100%
rename from actionservice/lib/action_service/client/base.rb
rename to actionwebservice/lib/action_service/client/base.rb
diff --git a/actionservice/lib/action_service/client/soap.rb b/actionwebservice/lib/action_service/client/soap.rb
similarity index 100%
rename from actionservice/lib/action_service/client/soap.rb
rename to actionwebservice/lib/action_service/client/soap.rb
diff --git a/actionservice/lib/action_service/client/xmlrpc.rb b/actionwebservice/lib/action_service/client/xmlrpc.rb
similarity index 100%
rename from actionservice/lib/action_service/client/xmlrpc.rb
rename to actionwebservice/lib/action_service/client/xmlrpc.rb
diff --git a/actionservice/lib/action_service/container.rb b/actionwebservice/lib/action_service/container.rb
similarity index 100%
rename from actionservice/lib/action_service/container.rb
rename to actionwebservice/lib/action_service/container.rb
diff --git a/actionservice/lib/action_service/invocation.rb b/actionwebservice/lib/action_service/invocation.rb
similarity index 100%
rename from actionservice/lib/action_service/invocation.rb
rename to actionwebservice/lib/action_service/invocation.rb
diff --git a/actionservice/lib/action_service/protocol.rb b/actionwebservice/lib/action_service/protocol.rb
similarity index 100%
rename from actionservice/lib/action_service/protocol.rb
rename to actionwebservice/lib/action_service/protocol.rb
diff --git a/actionservice/lib/action_service/protocol/abstract.rb b/actionwebservice/lib/action_service/protocol/abstract.rb
similarity index 100%
rename from actionservice/lib/action_service/protocol/abstract.rb
rename to actionwebservice/lib/action_service/protocol/abstract.rb
diff --git a/actionservice/lib/action_service/protocol/registry.rb b/actionwebservice/lib/action_service/protocol/registry.rb
similarity index 100%
rename from actionservice/lib/action_service/protocol/registry.rb
rename to actionwebservice/lib/action_service/protocol/registry.rb
diff --git a/actionservice/lib/action_service/protocol/soap.rb b/actionwebservice/lib/action_service/protocol/soap.rb
similarity index 100%
rename from actionservice/lib/action_service/protocol/soap.rb
rename to actionwebservice/lib/action_service/protocol/soap.rb
diff --git a/actionservice/lib/action_service/protocol/xmlrpc.rb b/actionwebservice/lib/action_service/protocol/xmlrpc.rb
similarity index 100%
rename from actionservice/lib/action_service/protocol/xmlrpc.rb
rename to actionwebservice/lib/action_service/protocol/xmlrpc.rb
diff --git a/actionservice/lib/action_service/router.rb b/actionwebservice/lib/action_service/router.rb
similarity index 100%
rename from actionservice/lib/action_service/router.rb
rename to actionwebservice/lib/action_service/router.rb
diff --git a/actionservice/lib/action_service/router/action_controller.rb b/actionwebservice/lib/action_service/router/action_controller.rb
similarity index 100%
rename from actionservice/lib/action_service/router/action_controller.rb
rename to actionwebservice/lib/action_service/router/action_controller.rb
diff --git a/actionservice/lib/action_service/router/wsdl.rb b/actionwebservice/lib/action_service/router/wsdl.rb
similarity index 100%
rename from actionservice/lib/action_service/router/wsdl.rb
rename to actionwebservice/lib/action_service/router/wsdl.rb
diff --git a/actionservice/lib/action_service/struct.rb b/actionwebservice/lib/action_service/struct.rb
similarity index 100%
rename from actionservice/lib/action_service/struct.rb
rename to actionwebservice/lib/action_service/struct.rb
diff --git a/actionservice/lib/action_service/support/class_inheritable_options.rb b/actionwebservice/lib/action_service/support/class_inheritable_options.rb
similarity index 100%
rename from actionservice/lib/action_service/support/class_inheritable_options.rb
rename to actionwebservice/lib/action_service/support/class_inheritable_options.rb
diff --git a/actionservice/lib/action_service/support/signature.rb b/actionwebservice/lib/action_service/support/signature.rb
similarity index 100%
rename from actionservice/lib/action_service/support/signature.rb
rename to actionwebservice/lib/action_service/support/signature.rb
diff --git a/actionservice/setup.rb b/actionwebservice/setup.rb
similarity index 100%
rename from actionservice/setup.rb
rename to actionwebservice/setup.rb
diff --git a/actionservice/test/abstract_client.rb b/actionwebservice/test/abstract_client.rb
similarity index 100%
rename from actionservice/test/abstract_client.rb
rename to actionwebservice/test/abstract_client.rb
diff --git a/actionservice/test/abstract_soap.rb b/actionwebservice/test/abstract_soap.rb
similarity index 100%
rename from actionservice/test/abstract_soap.rb
rename to actionwebservice/test/abstract_soap.rb
diff --git a/actionservice/test/abstract_unit.rb b/actionwebservice/test/abstract_unit.rb
similarity index 100%
rename from actionservice/test/abstract_unit.rb
rename to actionwebservice/test/abstract_unit.rb
diff --git a/actionservice/test/api_test.rb b/actionwebservice/test/api_test.rb
similarity index 100%
rename from actionservice/test/api_test.rb
rename to actionwebservice/test/api_test.rb
diff --git a/actionservice/test/base_test.rb b/actionwebservice/test/base_test.rb
similarity index 100%
rename from actionservice/test/base_test.rb
rename to actionwebservice/test/base_test.rb
diff --git a/actionservice/test/client_soap_test.rb b/actionwebservice/test/client_soap_test.rb
similarity index 100%
rename from actionservice/test/client_soap_test.rb
rename to actionwebservice/test/client_soap_test.rb
diff --git a/actionservice/test/client_xmlrpc_test.rb b/actionwebservice/test/client_xmlrpc_test.rb
similarity index 100%
rename from actionservice/test/client_xmlrpc_test.rb
rename to actionwebservice/test/client_xmlrpc_test.rb
diff --git a/actionservice/test/container_test.rb b/actionwebservice/test/container_test.rb
similarity index 100%
rename from actionservice/test/container_test.rb
rename to actionwebservice/test/container_test.rb
diff --git a/actionservice/test/invocation_test.rb b/actionwebservice/test/invocation_test.rb
similarity index 100%
rename from actionservice/test/invocation_test.rb
rename to actionwebservice/test/invocation_test.rb
diff --git a/actionservice/test/protocol_registry_test.rb b/actionwebservice/test/protocol_registry_test.rb
similarity index 100%
rename from actionservice/test/protocol_registry_test.rb
rename to actionwebservice/test/protocol_registry_test.rb
diff --git a/actionservice/test/protocol_soap_test.rb b/actionwebservice/test/protocol_soap_test.rb
similarity index 100%
rename from actionservice/test/protocol_soap_test.rb
rename to actionwebservice/test/protocol_soap_test.rb
diff --git a/actionservice/test/protocol_xmlrpc_test.rb b/actionwebservice/test/protocol_xmlrpc_test.rb
similarity index 100%
rename from actionservice/test/protocol_xmlrpc_test.rb
rename to actionwebservice/test/protocol_xmlrpc_test.rb
diff --git a/actionservice/test/router_action_controller_test.rb b/actionwebservice/test/router_action_controller_test.rb
similarity index 100%
rename from actionservice/test/router_action_controller_test.rb
rename to actionwebservice/test/router_action_controller_test.rb
diff --git a/actionservice/test/router_wsdl_test.rb b/actionwebservice/test/router_wsdl_test.rb
similarity index 100%
rename from actionservice/test/router_wsdl_test.rb
rename to actionwebservice/test/router_wsdl_test.rb
diff --git a/actionservice/test/struct_test.rb b/actionwebservice/test/struct_test.rb
similarity index 100%
rename from actionservice/test/struct_test.rb
rename to actionwebservice/test/struct_test.rb
diff --git a/railties/Rakefile b/railties/Rakefile
index f64f15b149..9bfe811b8e 100644
--- a/railties/Rakefile
+++ b/railties/Rakefile
@@ -246,7 +246,7 @@ spec = Gem::Specification.new do |s|
   s.add_dependency('activerecord', '>= 1.6.0')
   s.add_dependency('actionpack', '>= 1.4.0')
   s.add_dependency('actionmailer', '>= 0.6.1')
-  s.add_dependency('actionservice', '>= 0.4.0')
+  s.add_dependency('actionwebservice', '>= 0.4.0')
 
   s.rdoc_options << '--exclude' << '.'
   s.has_rdoc = false
diff --git a/railties/environments/shared.rb b/railties/environments/shared.rb
index 3638f6f1fc..b5340bd7c9 100644
--- a/railties/environments/shared.rb
+++ b/railties/environments/shared.rb
@@ -24,7 +24,7 @@ ADDITIONAL_LOAD_PATHS.concat %w(
   vendor/activerecord/lib
   vendor/actionpack/lib
   vendor/actionmailer/lib
-  vendor/actionservice/lib
+  vendor/actionwebservice/lib
 ).map { |dir| "#{RAILS_ROOT}/#{dir}" }
 
 # Prepend to $LOAD_PATH
diff --git a/railties/environments/shared_for_gem.rb b/railties/environments/shared_for_gem.rb
index dd2c7c2d29..dc424aa6b3 100644
--- a/railties/environments/shared_for_gem.rb
+++ b/railties/environments/shared_for_gem.rb
@@ -30,7 +30,7 @@ require_gem 'activesupport'
 require_gem 'activerecord'
 require_gem 'actionpack'
 require_gem 'actionmailer'
-require_gem 'actionservice'
+require_gem 'actionwebservice'
 require_gem 'rails'