diff --git a/R/eval.R b/R/evaluate.R
similarity index 100%
rename from R/eval.R
rename to R/evaluate.R
diff --git a/R/parse.R b/R/parse_all.R
similarity index 100%
rename from R/parse.R
rename to R/parse_all.R
diff --git a/R/watcher.R b/R/watchout.R
similarity index 100%
rename from R/watcher.R
rename to R/watchout.R
diff --git a/man/evaluate.Rd b/man/evaluate.Rd
index 7821944..4589298 100644
--- a/man/evaluate.Rd
+++ b/man/evaluate.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/eval.R
+% Please edit documentation in R/evaluate.R
 \name{evaluate}
 \alias{evaluate}
 \title{Evaluate input and return all details of evaluation}
diff --git a/man/parse_all.Rd b/man/parse_all.Rd
index 5e0966f..55e0c9e 100644
--- a/man/parse_all.Rd
+++ b/man/parse_all.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/parse.R
+% Please edit documentation in R/parse_all.R
 \name{parse_all}
 \alias{parse_all}
 \title{Parse, retaining comments}
diff --git a/tests/testthat/_snaps/eval.md b/tests/testthat/_snaps/evaluate.md
similarity index 100%
rename from tests/testthat/_snaps/eval.md
rename to tests/testthat/_snaps/evaluate.md
diff --git a/tests/testthat/_snaps/watcher.md b/tests/testthat/_snaps/watchout.md
similarity index 100%
rename from tests/testthat/_snaps/watcher.md
rename to tests/testthat/_snaps/watchout.md
diff --git a/tests/testthat/test-eval.R b/tests/testthat/test-evaluate.R
similarity index 100%
rename from tests/testthat/test-eval.R
rename to tests/testthat/test-evaluate.R
diff --git a/tests/testthat/test-parse.R b/tests/testthat/test-parse_all.R
similarity index 100%
rename from tests/testthat/test-parse.R
rename to tests/testthat/test-parse_all.R
diff --git a/tests/testthat/test-watcher.R b/tests/testthat/test-watchout.R
similarity index 100%
rename from tests/testthat/test-watcher.R
rename to tests/testthat/test-watchout.R