3 files changed, 4 insertions, 4 deletions

diff --git a/src/Screen.cc b/src/Screen.cc
index 63143ec..1e3d1c4 100644
--- a/src/Screen.cc
+++ b/src/Screen.cc
@@ -252,7 +252,7 @@ BScreen::ScreenResource::ScreenResource(FbTk::ResourceManager_base &rm,
     click_raises(rm, true, scrname+".clickRaises"),
     default_deco(rm, "NORMAL", scrname+".defaultDeco"),
     tab_placement(rm, FbWinFrame::TOPLEFT, scrname+".tab.placement"),
-    windowmenufile(rm, Fluxbox::instance()->getDefaultDataFilename("windowmenu2"), scrname+".windowMenu"),
+    windowmenufile(rm, Fluxbox::instance()->getDefaultDataFilename("windowmenu.lua"), scrname+".windowMenu"),
     typing_delay(rm, 0, scrname+".noFocusWhileTypingDelay"),
     workspaces(rm, 4, scrname+".workspaces"),
     edge_snap_threshold(rm, 10, scrname+".edgeSnapThreshold"),
diff --git a/src/fluxbox.cc b/src/fluxbox.cc
index 410bb45..b49e61f 100644
--- a/src/fluxbox.cc
+++ b/src/fluxbox.cc
@@ -246,8 +246,8 @@ Fluxbox::Fluxbox(int argc, char **argv,
       m_rc_tabs_padding(m_resourcemanager, 0, "tabPadding"),
       m_rc_stylefile(m_resourcemanager, DEFAULTSTYLE, "styleFile"),
       m_rc_styleoverlayfile(m_resourcemanager, m_RC_PATH + "/overlay", "styleOverlay"),
-      m_rc_menufile(m_resourcemanager, m_RC_PATH + "/menu2", "menuFile"),
-      m_rc_keyfile(m_resourcemanager, m_RC_PATH + "/keys", "keyFile"),
+      m_rc_menufile(m_resourcemanager, m_RC_PATH + "/menu.lua", "menuFile"),
+      m_rc_keyfile(m_resourcemanager, m_RC_PATH + "/keys.lua", "keyFile"),
       m_rc_appsfile(m_resourcemanager, m_RC_PATH + "/apps", "appsFile"),
       m_rc_tabs_attach_area(m_resourcemanager, ATTACH_AREA_WINDOW, "tabsAttachArea"),
       m_rc_cache_life(m_resourcemanager, 5, "cacheLife"),
diff --git a/src/main.cc b/src/main.cc
index 6fabf6a..e9355f9 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -230,7 +230,7 @@ struct Options {
         env = getenv("HOME");
         if (env) {
             rc_path.assign(std::string(env) + "/." + realProgramName("fluxbox"));
-            rc_file = rc_path + "/init2";
+            rc_file = rc_path + "/init.lua";
         }
     }