diff --git a/Makefile b/Makefile
index 63e6eee51..ffffe8992 100644
--- a/Makefile
+++ b/Makefile
@@ -3,55 +3,55 @@ SRCS = \
 	shell/match.c \
 	shell/math.c \
 	shell/random.c \
-	shell/shell_common.c \
+	shell/shell.common.c \
 	shell/glob.c \
 	coreutils/echo.c \
 	coreutils/test.c \
-	coreutils/test_ptr_hack.c \
-	libbb/xfuncs_printf.c \
+	coreutils/test.ptr.hack.c \
+	libbb/xfuncs.printf.c \
 	libbb/xfuncs.c \
 	libbb/xgetcwd.c \
 	libbb/getopt32.c \
-	libbb/perror_msg.c \
+	libbb/perror.msg.c \
 	libbb/xatonum.c \
-	libbb/u_signal_names.c \
-	libbb/ptr_to_globals.c \
-	libbb/default_error_retval.c \
-	libbb/xfunc_die.c \
-	libbb/safe_strncpy.c \
+	libbb/signal.names.c \
+	libbb/ptrtoglobals.c \
+	libbb/error.retval.c \
+	libbb/xfunc.die.c \
+	libbb/safe.strncpy.c \
 	libbb/lineedit.c \
-	libbb/lineedit_ptr_hack.c \
+	libbb/lineedptrhack.c \
 	libbb/platform.c \
 	libbb/endofname.c \
 	libbb/signals.c \
-	libbb/skip_whitespace.c \
+	libbb/skip.whitespc.c \
 	libbb/wfopen.c \
-	libbb/verror_msg.c \
-	libbb/bb_strtonum.c \
+	libbb/verror.msg.c \
+	libbb/bb.strtonum.c \
 	libbb/time.c \
-	libbb/printable_string.c \
-	libbb/full_write.c \
-	libbb/bb_qsort.c \
-	libbb/xrealloc_vector.c \
+	libbb/printable.str.c \
+	libbb/full.write.c \
+	libbb/bb.qsort.c \
+	libbb/xrealloc.vec.c \
 	libbb/copyfd.c \
-	libbb/read_key.c \
+	libbb/read.key.c \
 	libbb/unicode.c \
-	libbb/safe_write.c \
+	libbb/safe.write.c \
 	libbb/read.c \
-	libbb/safe_gethostname.c \
-	libbb/get_line_from_file.c \
-	libbb/concat_path_file.c \
-	libbb/last_char_is.c \
-	libbb/safe_poll.c \
-	libbb/process_escape_sequence.c \
-	libbb/compare_string_array.c \
+	libbb/s.gethostname.c \
+	libbb/get.line.c \
+	libbb/conc.pathfile.c \
+	libbb/last.char.is.c \
+	libbb/safe.poll.c \
+	libbb/escape.seq.c \
+	libbb/cmp.str.array.c \
 	libbb/llist.c \
-	libbb/parse_mode.c \
+	libbb/parse.mode.c \
 	libbb/messages.c \
 	libbb/appletlib.c \
-	libbb/get_last_path_component.c \
+	libbb/bb.basename.c \
 	libbb/mempcpy.c \
-	libbb/vfork_and_run.c
+	libbb/vfork.and.run.c
 OBJS = $(SRCS:.c=.o)
 ROOTS = $(SRCS:.c=.root)
 
diff --git a/build-gcc b/build.gcc
similarity index 100%
rename from build-gcc
rename to build.gcc
diff --git a/build-gs b/build.gs
similarity index 100%
rename from build-gs
rename to build.gs
diff --git a/coreutils/test_ptr_hack.c b/coreutils/test.ptr.hack.c
similarity index 100%
rename from coreutils/test_ptr_hack.c
rename to coreutils/test.ptr.hack.c
diff --git a/include/NUM_APPLETS.h b/include/NUM.APPLETS.h
similarity index 100%
rename from include/NUM_APPLETS.h
rename to include/NUM.APPLETS.h
diff --git a/include/applet_metadata.h b/include/appltmetadata.h
similarity index 100%
rename from include/applet_metadata.h
rename to include/appltmetadata.h
diff --git a/include/busybox.h b/include/busybox.h
index 2f7d4a9e5..1823c98ad 100644
--- a/include/busybox.h
+++ b/include/busybox.h
@@ -9,7 +9,7 @@
 
 #include "libbb.h"
 /* BB_DIR_foo and BB_SUID_bar constants: */
-#include "applet_metadata.h"
+#include "appltmetadata.h"
 
 PUSH_AND_SET_FUNCTION_VISIBILITY_TO_HIDDEN
 
diff --git a/libbb/get_last_path_component.c b/libbb/bb.basename.c
similarity index 100%
rename from libbb/get_last_path_component.c
rename to libbb/bb.basename.c
diff --git a/libbb/bb_qsort.c b/libbb/bb.qsort.c
similarity index 100%
rename from libbb/bb_qsort.c
rename to libbb/bb.qsort.c
diff --git a/libbb/bb_strtonum.c b/libbb/bb.strtonum.c
similarity index 100%
rename from libbb/bb_strtonum.c
rename to libbb/bb.strtonum.c
diff --git a/libbb/compare_string_array.c b/libbb/cmp.str.array.c
similarity index 100%
rename from libbb/compare_string_array.c
rename to libbb/cmp.str.array.c
diff --git a/libbb/concat_path_file.c b/libbb/conc.pathfile.c
similarity index 100%
rename from libbb/concat_path_file.c
rename to libbb/conc.pathfile.c
diff --git a/libbb/default_error_retval.c b/libbb/error.retval.c
similarity index 100%
rename from libbb/default_error_retval.c
rename to libbb/error.retval.c
diff --git a/libbb/process_escape_sequence.c b/libbb/escape.seq.c
similarity index 100%
rename from libbb/process_escape_sequence.c
rename to libbb/escape.seq.c
diff --git a/libbb/full_write.c b/libbb/full.write.c
similarity index 100%
rename from libbb/full_write.c
rename to libbb/full.write.c
diff --git a/libbb/get_line_from_file.c b/libbb/get.line.c
similarity index 100%
rename from libbb/get_line_from_file.c
rename to libbb/get.line.c
diff --git a/libbb/last_char_is.c b/libbb/last.char.is.c
similarity index 100%
rename from libbb/last_char_is.c
rename to libbb/last.char.is.c
diff --git a/libbb/lineedit_ptr_hack.c b/libbb/lineedptrhack.c
similarity index 100%
rename from libbb/lineedit_ptr_hack.c
rename to libbb/lineedptrhack.c
diff --git a/libbb/parse_mode.c b/libbb/parse.mode.c
similarity index 100%
rename from libbb/parse_mode.c
rename to libbb/parse.mode.c
diff --git a/libbb/perror_msg.c b/libbb/perror.msg.c
similarity index 100%
rename from libbb/perror_msg.c
rename to libbb/perror.msg.c
diff --git a/libbb/printable_string.c b/libbb/printable.str.c
similarity index 100%
rename from libbb/printable_string.c
rename to libbb/printable.str.c
diff --git a/libbb/ptr_to_globals.c b/libbb/ptrtoglobals.c
similarity index 100%
rename from libbb/ptr_to_globals.c
rename to libbb/ptrtoglobals.c
diff --git a/libbb/read_key.c b/libbb/read.key.c
similarity index 100%
rename from libbb/read_key.c
rename to libbb/read.key.c
diff --git a/libbb/safe_gethostname.c b/libbb/s.gethostname.c
similarity index 100%
rename from libbb/safe_gethostname.c
rename to libbb/s.gethostname.c
diff --git a/libbb/safe_poll.c b/libbb/safe.poll.c
similarity index 100%
rename from libbb/safe_poll.c
rename to libbb/safe.poll.c
diff --git a/libbb/safe_strncpy.c b/libbb/safe.strncpy.c
similarity index 100%
rename from libbb/safe_strncpy.c
rename to libbb/safe.strncpy.c
diff --git a/libbb/safe_write.c b/libbb/safe.write.c
similarity index 100%
rename from libbb/safe_write.c
rename to libbb/safe.write.c
diff --git a/libbb/u_signal_names.c b/libbb/signal.names.c
similarity index 100%
rename from libbb/u_signal_names.c
rename to libbb/signal.names.c
diff --git a/libbb/skip_whitespace.c b/libbb/skip.whitespc.c
similarity index 100%
rename from libbb/skip_whitespace.c
rename to libbb/skip.whitespc.c
diff --git a/libbb/verror_msg.c b/libbb/verror.msg.c
similarity index 100%
rename from libbb/verror_msg.c
rename to libbb/verror.msg.c
diff --git a/libbb/vfork_and_run.c b/libbb/vfork.and.run.c
similarity index 100%
rename from libbb/vfork_and_run.c
rename to libbb/vfork.and.run.c
diff --git a/libbb/xatonum.c b/libbb/xatonum.c
index 332586f0b..be36ee032 100644
--- a/libbb/xatonum.c
+++ b/libbb/xatonum.c
@@ -18,7 +18,7 @@
 #define XSTR_TYPE_MAX LONG_MAX
 #define XSTR_TYPE_MIN LONG_MIN
 #define XSTR_STRTOU strtoul
-#include "xatonum_template.c"
+#include "xatonum.tmplt.c"
 
 #if UINT_MAX != ULONG_MAX
 static ALWAYS_INLINE
@@ -41,7 +41,7 @@ unsigned bb_strtoui(const char *str, char **end, int b)
 #define XSTR_TYPE_MIN INT_MIN
 /* libc has no strtoui, so we need to create/use our own */
 #define XSTR_STRTOU bb_strtoui
-#include "xatonum_template.c"
+#include "xatonum.tmplt.c"
 #endif
 
 /* A few special cases */
diff --git a/libbb/xatonum_template.c b/libbb/xatonum.tmplt.c
similarity index 100%
rename from libbb/xatonum_template.c
rename to libbb/xatonum.tmplt.c
diff --git a/libbb/xfunc_die.c b/libbb/xfunc.die.c
similarity index 100%
rename from libbb/xfunc_die.c
rename to libbb/xfunc.die.c
diff --git a/libbb/xfuncs_printf.c b/libbb/xfuncs.printf.c
similarity index 100%
rename from libbb/xfuncs_printf.c
rename to libbb/xfuncs.printf.c
diff --git a/libbb/xrealloc_vector.c b/libbb/xrealloc.vec.c
similarity index 100%
rename from libbb/xrealloc_vector.c
rename to libbb/xrealloc.vec.c
diff --git a/notes/hush_doc.txt b/notes/hush.doc.txt
similarity index 100%
rename from notes/hush_doc.txt
rename to notes/hush.doc.txt
diff --git a/shell/hush.c b/shell/hush.c
index 1a59a70a0..025066441 100644
--- a/shell/hush.c
+++ b/shell/hush.c
@@ -97,7 +97,7 @@
 
 #include "busybox.h"  /* for APPLET_IS_NOFORK/NOEXEC */
 #include "unicode.h"
-#include "shell_common.h"
+#include "shell.common.h"
 #include "math.h"
 #include "match.h"
 #if ENABLE_HUSH_RANDOM_SUPPORT
@@ -306,7 +306,7 @@
 # define USE_FOR_MMU(x)
 #endif
 
-#include "NUM_APPLETS.h"
+#include "NUM.APPLETS.h"
 #if NUM_APPLETS == 1
 /* STANDALONE does not make sense, and won't compile */
 # undef CONFIG_FEATURE_SH_STANDALONE
diff --git a/shell/hush_leaktool.sh b/shell/hushleaktool.sh
similarity index 100%
rename from shell/hush_leaktool.sh
rename to shell/hushleaktool.sh
diff --git a/shell/shell_common.c b/shell/shell.common.c
similarity index 99%
rename from shell/shell_common.c
rename to shell/shell.common.c
index 2b336c301..30abf9adb 100644
--- a/shell/shell_common.c
+++ b/shell/shell.common.c
@@ -17,7 +17,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 #include "libbb.h"
-#include "shell_common.h"
+#include "shell.common.h"
 #include <sys/resource.h> /* getrlimit */
 
 const char defifsvar[] ALIGN1 = "IFS= \t\n";
diff --git a/shell/shell_common.h b/shell/shell.common.h
similarity index 100%
rename from shell/shell_common.h
rename to shell/shell.common.h