diff --git a/basis/bootstrap/tools/tools.factor b/basis/bootstrap/tools/tools.factor
index 418a3b6edb..731b36d1ce 100644
--- a/basis/bootstrap/tools/tools.factor
+++ b/basis/bootstrap/tools/tools.factor
@@ -14,7 +14,7 @@ IN: bootstrap.tools
     "tools.disassembler"
     "tools.dispatch"
     "tools.memory"
-    "tools.counting-profiler"
+    "tools.profiler.counting"
     "tools.test"
     "tools.time"
     "tools.threads"
diff --git a/basis/listener/listener.factor b/basis/listener/listener.factor
index cdc85a79d7..0ad02e073b 100644
--- a/basis/listener/listener.factor
+++ b/basis/listener/listener.factor
@@ -175,7 +175,7 @@ SYMBOL: interactive-vocabs
     "tools.dispatch"
     "tools.errors"
     "tools.memory"
-    "tools.counting-profiler"
+    "tools.profiler.counting"
     "tools.test"
     "tools.threads"
     "tools.time"
diff --git a/basis/stack-checker/known-words/known-words.factor b/basis/stack-checker/known-words/known-words.factor
index 0d7629e83d..c67b22c507 100644
--- a/basis/stack-checker/known-words/known-words.factor
+++ b/basis/stack-checker/known-words/known-words.factor
@@ -14,7 +14,7 @@ compiler.units system.private combinators tools.memory.private
 combinators.short-circuit locals locals.backend locals.types
 combinators.private stack-checker.values generic.single
 generic.single.private alien.libraries tools.dispatch.private
-tools.counting-profiler.private macros
+tools.profiler.counting.private macros
 stack-checker.alien
 stack-checker.state
 stack-checker.errors
diff --git a/basis/tools/counting-profiler/authors.txt b/basis/tools/profiler/counting/authors.txt
similarity index 100%
rename from basis/tools/counting-profiler/authors.txt
rename to basis/tools/profiler/counting/authors.txt
diff --git a/basis/tools/counting-profiler/counting-profiler-docs.factor b/basis/tools/profiler/counting/counting-docs.factor
similarity index 95%
rename from basis/tools/counting-profiler/counting-profiler-docs.factor
rename to basis/tools/profiler/counting/counting-docs.factor
index 9b993fffee..19d3bbea75 100644
--- a/basis/tools/counting-profiler/counting-profiler-docs.factor
+++ b/basis/tools/profiler/counting/counting-docs.factor
@@ -1,6 +1,6 @@
-USING: tools.counting-profiler.private tools.time tools.crossref
+USING: tools.profiler.counting.private tools.time tools.crossref
 help.markup help.syntax quotations io strings words definitions ;
-IN: tools.counting-profiler
+IN: tools.profiler.counting
 
 ARTICLE: "profiler-limitations" "Profiler limitations"
 "Certain optimizations performed by the compiler can inhibit accurate call counting:"
@@ -12,7 +12,7 @@ ARTICLE: "profiler-limitations" "Profiler limitations"
 } ;
 
 ARTICLE: "profiling" "Profiling code" 
-"The " { $vocab-link "tools.counting-profiler" } " vocabulary implements a simple call counting profiler."
+"The " { $vocab-link "tools.profiler.counting" } " vocabulary implements a simple call counting profiler."
 $nl
 "Quotations can be passed to a combinator which calls them with the profiler enabled:"
 { $subsections profile }
diff --git a/basis/tools/counting-profiler/counting-profiler-tests.factor b/basis/tools/profiler/counting/counting-tests.factor
similarity index 91%
rename from basis/tools/counting-profiler/counting-profiler-tests.factor
rename to basis/tools/profiler/counting/counting-tests.factor
index c05c12b399..4d5497a807 100644
--- a/basis/tools/counting-profiler/counting-profiler-tests.factor
+++ b/basis/tools/profiler/counting/counting-tests.factor
@@ -1,7 +1,7 @@
-USING: accessors tools.counting-profiler tools.test kernel memory math
-threads alien alien.c-types tools.counting-profiler.private sequences
+USING: accessors tools.profiler.counting tools.test kernel memory math
+threads alien alien.c-types tools.profiler.counting.private sequences
 compiler.test compiler.units words arrays ;
-IN: tools.counting-profiler.tests
+IN: tools.profiler.counting.tests
 
 [ t ] [
     \ length counter>>
diff --git a/basis/tools/counting-profiler/counting-profiler.factor b/basis/tools/profiler/counting/counting.factor
similarity index 96%
rename from basis/tools/counting-profiler/counting-profiler.factor
rename to basis/tools/profiler/counting/counting.factor
index d94264d847..92fa931c81 100644
--- a/basis/tools/counting-profiler/counting-profiler.factor
+++ b/basis/tools/profiler/counting/counting.factor
@@ -3,10 +3,10 @@
 USING: accessors words sequences math prettyprint kernel arrays
 io io.styles namespaces assocs kernel.private strings
 combinators sorting math.parser vocabs definitions
-tools.counting-profiler.private tools.crossref continuations generic
+tools.profiler.counting.private tools.crossref continuations generic
 compiler.units compiler.crossref sets classes fry ;
 FROM: sets => members ;
-IN: tools.counting-profiler
+IN: tools.profiler.counting
 
 : profile ( quot -- )
     [ t profiling call ] [ f profiling ] [ ] cleanup ; inline
diff --git a/basis/tools/counting-profiler/summary.txt b/basis/tools/profiler/counting/summary.txt
similarity index 100%
rename from basis/tools/counting-profiler/summary.txt
rename to basis/tools/profiler/counting/summary.txt
diff --git a/basis/tools/counting-profiler/tags.txt b/basis/tools/profiler/counting/tags.txt
similarity index 100%
rename from basis/tools/counting-profiler/tags.txt
rename to basis/tools/profiler/counting/tags.txt
diff --git a/basis/ui/tools/operations/operations-docs.factor b/basis/ui/tools/operations/operations-docs.factor
index 4636155eb0..ceaf36429a 100644
--- a/basis/ui/tools/operations/operations-docs.factor
+++ b/basis/ui/tools/operations/operations-docs.factor
@@ -1,5 +1,5 @@
 USING: help.tips help.markup help.syntax ui.operations
-tools.walker tools.time tools.counting-profiler ui.tools.operations ;
+tools.walker tools.time tools.profiler.counting ui.tools.operations ;
 
 TIP: "Press " { $operation com-stack-effect } " to print the stack effect of the code in the input field without executing it (" { $link "inference" } ")." ;
 
diff --git a/basis/ui/tools/operations/operations.factor b/basis/ui/tools/operations/operations.factor
index 5696b11db1..4ed9f53807 100644
--- a/basis/ui/tools/operations/operations.factor
+++ b/basis/ui/tools/operations/operations.factor
@@ -3,7 +3,7 @@
 USING: continuations definitions generic help.topics threads
 stack-checker summary io.pathnames io.styles kernel namespaces
 parser prettyprint quotations tools.crossref tools.annotations
-editors tools.counting-profiler tools.test tools.time tools.walker vocabs
+editors tools.profiler.counting tools.test tools.time tools.walker vocabs
 vocabs.loader words sequences classes compiler.errors
 compiler.units accessors vocabs.parser macros.expander ui
 ui.tools.browser ui.tools.listener ui.tools.listener.completion
diff --git a/basis/ui/tools/profiler/profiler.factor b/basis/ui/tools/profiler/profiler.factor
index 415be39802..24060da958 100644
--- a/basis/ui/tools/profiler/profiler.factor
+++ b/basis/ui/tools/profiler/profiler.factor
@@ -3,7 +3,7 @@
 USING: accessors arrays assocs combinators.short-circuit
 combinators.smart definitions.icons fry kernel locals
 math.order models models.search models.sort present see
-sequences tools.counting-profiler ui.baseline-alignment ui.commands
+sequences tools.profiler.counting ui.baseline-alignment ui.commands
 ui.gadgets ui.gadgets.borders ui.gadgets.buttons
 ui.gadgets.labeled ui.gadgets.labels ui.gadgets.packs
 ui.gadgets.search-tables ui.gadgets.status-bar
diff --git a/basis/ui/tools/tools-docs.factor b/basis/ui/tools/tools-docs.factor
index bd4708d299..b4f38c23de 100644
--- a/basis/ui/tools/tools-docs.factor
+++ b/basis/ui/tools/tools-docs.factor
@@ -1,5 +1,5 @@
 USING: editors help.markup help.syntax summary inspector io io.styles
-listener parser prettyprint tools.counting-profiler tools.walker ui.commands
+listener parser prettyprint tools.profiler.counting tools.walker ui.commands
 ui.gadgets.panes ui.gadgets.presentations ui.operations
 ui.tools.operations ui.tools.profiler ui.tools.common vocabs see
 help.tips ;
diff --git a/core/bootstrap/primitives.factor b/core/bootstrap/primitives.factor
index fddf3bc2fc..adba748606 100755
--- a/core/bootstrap/primitives.factor
+++ b/core/bootstrap/primitives.factor
@@ -104,7 +104,7 @@ call( -- )
     "threads.private"
     "tools.dispatch.private"
     "tools.memory.private"
-    "tools.counting-profiler.private"
+    "tools.profiler.counting.private"
     "words"
     "words.private"
     "vectors"
@@ -547,7 +547,7 @@ tuple
     { "retainstack-for" "threads.private" "primitive_retainstack_for" ( context -- array ) }
     { "dispatch-stats" "tools.dispatch.private" "primitive_dispatch_stats" ( -- stats ) }
     { "reset-dispatch-stats" "tools.dispatch.private" "primitive_reset_dispatch_stats" ( -- ) }
-    { "profiling" "tools.counting-profiler.private" "primitive_counting_profiler" ( ? -- ) }
+    { "profiling" "tools.profiler.counting.private" "primitive_counting_profiler" ( ? -- ) }
     { "optimized?" "words" "primitive_optimized_p" ( word -- ? ) }
     { "word-code" "words" "primitive_word_code" ( word -- start end ) }
     { "(word)" "words.private" "primitive_word" ( name vocab hashcode -- word ) }