diff --git a/modules/wombat/Makefile.in b/modules/lua/Makefile.in
similarity index 100%
rename from modules/wombat/Makefile.in
rename to modules/lua/Makefile.in
diff --git a/modules/wombat/README b/modules/lua/README
similarity index 100%
rename from modules/wombat/README
rename to modules/lua/README
diff --git a/modules/wombat/apr_lua.c b/modules/lua/apr_lua.c
similarity index 100%
rename from modules/wombat/apr_lua.c
rename to modules/lua/apr_lua.c
diff --git a/modules/wombat/apr_lua.h b/modules/lua/apr_lua.h
similarity index 100%
rename from modules/wombat/apr_lua.h
rename to modules/lua/apr_lua.h
diff --git a/modules/wombat/config.c b/modules/lua/config.c
similarity index 100%
rename from modules/wombat/config.c
rename to modules/lua/config.c
diff --git a/modules/wombat/config.h b/modules/lua/config.h
similarity index 98%
rename from modules/wombat/config.h
rename to modules/lua/config.h
index 0ff12f9041..88edb82ab3 100644
--- a/modules/wombat/config.h
+++ b/modules/lua/config.h
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
  
-#include "mod_wombat.h"
+#include "mod_lua.h"
 
 #ifndef APW_CONFIG_H
 #define APW_CONFIG_H
diff --git a/modules/wombat/config.m4 b/modules/lua/config.m4
similarity index 93%
rename from modules/wombat/config.m4
rename to modules/lua/config.m4
index 3ee79f718b..035f34b1c8 100644
--- a/modules/wombat/config.m4
+++ b/modules/lua/config.m4
@@ -1,5 +1,5 @@
 
-APACHE_MODPATH_INIT(wombat)
+APACHE_MODPATH_INIT(lua)
 
 dnl Check for Lua 5.1 Libraries
 dnl CHECK_LUA(ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND])
@@ -92,9 +92,9 @@ else
 fi 
 ])
 
-wombat_objects="apr_lua.lo config.lo mod_wombat.lo request.lo vmprep.lo"
+lua_objects="apr_lua.lo config.lo mod_lua.lo request.lo vmprep.lo"
 
-APACHE_MODULE(wombat, Apache Lua Framework, $wombat_objects, , no,
+APACHE_MODULE(lua, Apache Lua Framework, $lua_objects, , no,
 [
 CHECK_LUA()
 APR_ADDTO(LIBS, ["$LUA_LIBS"])
diff --git a/modules/wombat/docs/README b/modules/lua/docs/README
similarity index 100%
rename from modules/wombat/docs/README
rename to modules/lua/docs/README
diff --git a/modules/wombat/docs/basic-configuration.txt b/modules/lua/docs/basic-configuration.txt
similarity index 100%
rename from modules/wombat/docs/basic-configuration.txt
rename to modules/lua/docs/basic-configuration.txt
diff --git a/modules/wombat/docs/building-from-subversion.txt b/modules/lua/docs/building-from-subversion.txt
similarity index 100%
rename from modules/wombat/docs/building-from-subversion.txt
rename to modules/lua/docs/building-from-subversion.txt
diff --git a/modules/wombat/docs/running-developer-tests.txt b/modules/lua/docs/running-developer-tests.txt
similarity index 100%
rename from modules/wombat/docs/running-developer-tests.txt
rename to modules/lua/docs/running-developer-tests.txt
diff --git a/modules/wombat/docs/writing-handlers.txt b/modules/lua/docs/writing-handlers.txt
similarity index 100%
rename from modules/wombat/docs/writing-handlers.txt
rename to modules/lua/docs/writing-handlers.txt
diff --git a/modules/wombat/mod_wombat.c b/modules/lua/mod_lua.c
similarity index 98%
rename from modules/wombat/mod_wombat.c
rename to modules/lua/mod_lua.c
index 8dc94351a7..c23844c06b 100644
--- a/modules/wombat/mod_wombat.c
+++ b/modules/lua/mod_lua.c
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-#include "mod_wombat.h"
+#include "mod_lua.h"
 #include "config.h"
 #include <string.h>
 #include <stdlib.h>
@@ -33,7 +33,7 @@ APR_IMPLEMENT_OPTIONAL_HOOK_RUN_ALL(apw, WOMBAT, int, wombat_request,
                                     (L, r),
                                     OK, DECLINED)
 
-module AP_MODULE_DECLARE_DATA wombat_module;
+module AP_MODULE_DECLARE_DATA lua_module;
 
 /**
  * error reporting if lua has an error. 
@@ -100,10 +100,10 @@ static int wombat_handler(request_rec *r) {
     }
     
     ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, "handling [%s] in mod_wombat", r->filename);
-    apw_dir_cfg *dcfg = ap_get_module_config(r->per_dir_config, &wombat_module);
+    apw_dir_cfg *dcfg = ap_get_module_config(r->per_dir_config, &lua_module);
     
     if (!r->header_only) {        
-        apw_request_cfg* rcfg = ap_get_module_config(r->request_config, &wombat_module);
+        apw_request_cfg* rcfg = ap_get_module_config(r->request_config, &lua_module);
         mapped_request_details *d = rcfg->mapped_request_details;
         apw_vm_spec *spec = NULL;
         if (!d) {
@@ -119,7 +119,7 @@ static int wombat_handler(request_rec *r) {
         ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, "request details scope:%u, cache:%u",
                                                        d->spec->scope,
                                                        d->spec->code_cache_style);
-        const apw_dir_cfg* cfg = ap_get_module_config(r->per_dir_config, &wombat_module);
+        const apw_dir_cfg* cfg = ap_get_module_config(r->per_dir_config, &lua_module);
         lua_State *L =  apw_get_lua_state(r->pool,
                                           d->spec->file,
                                           cfg->package_paths,
@@ -147,7 +147,7 @@ static int wombat_handler(request_rec *r) {
  * Like mod_alias except for lua handler fun :-) 
  */
 static int apw_alias_munger(request_rec *r) {
-    const apw_dir_cfg *cfg = ap_get_module_config(r->per_dir_config, &wombat_module);
+    const apw_dir_cfg *cfg = ap_get_module_config(r->per_dir_config, &lua_module);
     
     int i;
     ap_regmatch_t matches[AP_MAX_REG_MATCH];
@@ -174,7 +174,7 @@ static int apw_alias_munger(request_rec *r) {
             
             /* now do replacement on method name where? */
             r->filename = apr_pstrdup(r->pool, spec->file);
-            apw_request_cfg *rcfg = ap_get_module_config(r->request_config, &wombat_module);
+            apw_request_cfg *rcfg = ap_get_module_config(r->request_config, &lua_module);
             rcfg->mapped_request_details = d;
             return OK;
         }
@@ -190,7 +190,7 @@ static int wombat_request_rec_hook_harness(request_rec *r, const char *name) {
     char *fixed_filename;
     
     const apw_dir_cfg* cfg = (apw_dir_cfg*) ap_get_module_config(r->per_dir_config,
-                                                                       &wombat_module);
+                                                                       &lua_module);
     apr_array_header_t *hook_specs = apr_hash_get(cfg->hooks, name, APR_HASH_KEY_STRING);
     if (hook_specs) {
         int i;
@@ -207,14 +207,14 @@ static int wombat_request_rec_hook_harness(request_rec *r, const char *name) {
             spec->pool = r->pool;
             
             /*
-            const apw_dir_cfg* cfg = ap_get_module_config(r->per_dir_config, &wombat_module);
+            const apw_dir_cfg* cfg = ap_get_module_config(r->per_dir_config, &lua_module);
             lua_State *L =  apw_get_lua_state(r->pool,
                                               d->spec->file,
                                               cfg->package_paths,
                                               cfg->package_cpaths,
                                               &wombat_open_callback, NULL);
             */            
-            apw_server_cfg *server_cfg = ap_get_module_config(r->server->module_config, &wombat_module);
+            apw_server_cfg *server_cfg = ap_get_module_config(r->server->module_config, &lua_module);
             apr_filepath_merge(&fixed_filename, server_cfg->root_path, spec->file, APR_FILEPATH_NOTRELATIVE, r->pool);
             lua_State *L =  apw_get_lua_state(r->pool,
                                               fixed_filename,
@@ -608,7 +608,7 @@ static const char* register_quick_block(cmd_parms *cmd, void *_cfg, const char *
 static const char* register_package_helper(cmd_parms *cmd, const char *arg, apr_array_header_t *dir_array) {
     apr_status_t rv;
         
-    apw_server_cfg *server_cfg = ap_get_module_config(cmd->server->module_config, &wombat_module);
+    apw_server_cfg *server_cfg = ap_get_module_config(cmd->server->module_config, &lua_module);
     char *fixed_filename;
     rv = apr_filepath_merge(&fixed_filename, server_cfg->root_path, arg, APR_FILEPATH_NOTRELATIVE, cmd->pool);
     if (rv != APR_SUCCESS) {
@@ -710,7 +710,7 @@ static const char* lua_map_handler(cmd_parms *cmd, void *_cfg, const char *path,
 
 static const char* register_lua_root(cmd_parms *cmd, void *_cfg, const char *root) {
     /* apw_dir_cfg* cfg = (apw_dir_cfg*)_cfg; */
-    apw_server_cfg* cfg = ap_get_module_config(cmd->server->module_config, &wombat_module);
+    apw_server_cfg* cfg = ap_get_module_config(cmd->server->module_config, &lua_module);
     
     cfg->root_path = root;
     return NULL;
@@ -820,7 +820,7 @@ static int create_request_config(request_rec *r) {
     apw_request_cfg *cfg = apr_palloc(r->pool, sizeof(apw_request_cfg));
     cfg->mapped_request_details = NULL;
     cfg->request_scoped_vms = apr_hash_make(r->pool);
-    ap_set_module_config(r->request_config, &wombat_module, cfg);
+    ap_set_module_config(r->request_config, &lua_module, cfg);
     return OK;
 }
 
@@ -869,7 +869,7 @@ static void wombat_register_hooks(apr_pool_t *p) {
 		      APR_HOOK_REALLY_FIRST); 
 }
 
-module AP_MODULE_DECLARE_DATA wombat_module = {
+module AP_MODULE_DECLARE_DATA lua_module = {
     STANDARD20_MODULE_STUFF, 
     create_dir_config,              /* create per-dir    config structures */
     NULL,                           /* merge  per-dir    config structures */
diff --git a/modules/wombat/mod_wombat.h b/modules/lua/mod_lua.h
similarity index 96%
rename from modules/wombat/mod_wombat.h
rename to modules/lua/mod_lua.h
index 5f65435665..8f72ef0aa5 100644
--- a/modules/wombat/mod_wombat.h
+++ b/modules/lua/mod_lua.h
@@ -1,6 +1,3 @@
-#ifndef MOD_WOMBAT_H
-#define MOD_WOMBAT_H
-
 /**
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -18,6 +15,9 @@
  * limitations under the License.
  */
 
+#ifndef _MOD_LUA_H_
+#define _MOD_LUA_H_
+
 #include <stdio.h>
 
 #include "httpd.h"
@@ -113,8 +113,7 @@ typedef struct {
     char *function;
 } apw_filter_ctx;
 
-extern module AP_MODULE_DECLARE_DATA wombat_module;
-/* module wombat_module; */
+extern module AP_MODULE_DECLARE_DATA lua_module;
 
 #if !defined(WIN32)
 #define WOMBAT_DECLARE(type)            type
@@ -140,5 +139,5 @@ APR_DECLARE_EXTERNAL_HOOK(apw, WOMBAT, int, wombat_open,
 APR_DECLARE_EXTERNAL_HOOK(apw, WOMBAT, int, wombat_request,
                           (lua_State *L, request_rec *r));
 
-#endif /* !MOD_WOMBAT_H */
+#endif /* !_MOD_LUA_H_ */
 
diff --git a/modules/wombat/request.c b/modules/lua/request.c
similarity index 99%
rename from modules/wombat/request.c
rename to modules/lua/request.c
index f93f5f0c44..62ab613ab2 100644
--- a/modules/wombat/request.c
+++ b/modules/lua/request.c
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-#include "mod_wombat.h"
+#include "mod_lua.h"
 #include "util_script.h"
 #include "apr_lua.h"
 
diff --git a/modules/wombat/request.h b/modules/lua/request.h
similarity index 100%
rename from modules/wombat/request.h
rename to modules/lua/request.h
diff --git a/modules/wombat/test/helpers.lua b/modules/lua/test/helpers.lua
similarity index 100%
rename from modules/wombat/test/helpers.lua
rename to modules/lua/test/helpers.lua
diff --git a/modules/wombat/test/htdocs/config_tests.lua b/modules/lua/test/htdocs/config_tests.lua
similarity index 100%
rename from modules/wombat/test/htdocs/config_tests.lua
rename to modules/lua/test/htdocs/config_tests.lua
diff --git a/modules/wombat/test/htdocs/filters.lua b/modules/lua/test/htdocs/filters.lua
similarity index 100%
rename from modules/wombat/test/htdocs/filters.lua
rename to modules/lua/test/htdocs/filters.lua
diff --git a/modules/wombat/test/htdocs/find_me.txt b/modules/lua/test/htdocs/find_me.txt
similarity index 100%
rename from modules/wombat/test/htdocs/find_me.txt
rename to modules/lua/test/htdocs/find_me.txt
diff --git a/modules/wombat/test/htdocs/hooks.lua b/modules/lua/test/htdocs/hooks.lua
similarity index 100%
rename from modules/wombat/test/htdocs/hooks.lua
rename to modules/lua/test/htdocs/hooks.lua
diff --git a/modules/wombat/test/htdocs/other.lua b/modules/lua/test/htdocs/other.lua
similarity index 100%
rename from modules/wombat/test/htdocs/other.lua
rename to modules/lua/test/htdocs/other.lua
diff --git a/modules/wombat/test/htdocs/simple.lua b/modules/lua/test/htdocs/simple.lua
similarity index 100%
rename from modules/wombat/test/htdocs/simple.lua
rename to modules/lua/test/htdocs/simple.lua
diff --git a/modules/wombat/test/htdocs/test.lua b/modules/lua/test/htdocs/test.lua
similarity index 100%
rename from modules/wombat/test/htdocs/test.lua
rename to modules/lua/test/htdocs/test.lua
diff --git a/modules/wombat/test/httpd_config.lua b/modules/lua/test/httpd_config.lua
similarity index 100%
rename from modules/wombat/test/httpd_config.lua
rename to modules/lua/test/httpd_config.lua
diff --git a/modules/wombat/test/lib/kangaroo.lua b/modules/lua/test/lib/kangaroo.lua
similarity index 100%
rename from modules/wombat/test/lib/kangaroo.lua
rename to modules/lua/test/lib/kangaroo.lua
diff --git a/modules/wombat/test/moonunit.lua b/modules/lua/test/moonunit.lua
similarity index 100%
rename from modules/wombat/test/moonunit.lua
rename to modules/lua/test/moonunit.lua
diff --git a/modules/wombat/test/test.lua b/modules/lua/test/test.lua
similarity index 100%
rename from modules/wombat/test/test.lua
rename to modules/lua/test/test.lua
diff --git a/modules/wombat/test/test_httpd.conf b/modules/lua/test/test_httpd.conf
similarity index 100%
rename from modules/wombat/test/test_httpd.conf
rename to modules/lua/test/test_httpd.conf
diff --git a/modules/wombat/vmprep.c b/modules/lua/vmprep.c
similarity index 99%
rename from modules/wombat/vmprep.c
rename to modules/lua/vmprep.c
index 5ebbc83e37..3e063f2403 100644
--- a/modules/wombat/vmprep.c
+++ b/modules/lua/vmprep.c
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 #include "vmprep.h"
-#include "mod_wombat.h"
+#include "mod_lua.h"
 #include "http_log.h"
 #include "apr_reslist.h"
 #include "apr_uuid.h"
diff --git a/modules/wombat/vmprep.h b/modules/lua/vmprep.h
similarity index 100%
rename from modules/wombat/vmprep.h
rename to modules/lua/vmprep.h