diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm
index 92b4d4c27e..4fb15c6471 100644
--- a/gnu/packages/algebra.scm
+++ b/gnu/packages/algebra.scm
@@ -36,7 +36,7 @@ (define-module (gnu packages algebra)
   #:use-module (gnu packages readline)
   #:use-module (gnu packages flex)
   #:use-module (gnu packages python)
-  #:use-module (gnu packages tcsh)
+  #:use-module (gnu packages shells)
   #:use-module (gnu packages tex)
   #:use-module (gnu packages xiph)
   #:use-module (gnu packages xorg)
diff --git a/gnu/packages/boost.scm b/gnu/packages/boost.scm
index fd8f4e80e3..8fe8c8e899 100644
--- a/gnu/packages/boost.scm
+++ b/gnu/packages/boost.scm
@@ -28,7 +28,7 @@ (define-module (gnu packages boost)
   #:use-module (gnu packages)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages python)
-  #:use-module (gnu packages tcsh)
+  #:use-module (gnu packages shells)
   #:use-module (gnu packages perl))
 
 (define-public boost
diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index ea7575abb2..fcea0bca0e 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -79,7 +79,7 @@ (define-module (gnu packages maths)
   #:use-module (gnu packages python)
   #:use-module (gnu packages readline)
   #:use-module (gnu packages tbb)
-  #:use-module (gnu packages tcsh)
+  #:use-module (gnu packages shells)
   #:use-module (gnu packages tcl)
   #:use-module (gnu packages texinfo)
   #:use-module (gnu packages tex)
diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 8501792250..9dde8a9eab 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -45,7 +45,7 @@ (define-module (gnu packages tex)
   #:use-module (gnu packages python)
   #:use-module (gnu packages qt)
   #:use-module (gnu packages ruby)
-  #:use-module (gnu packages tcsh)
+  #:use-module (gnu packages shells)
   #:use-module (gnu packages base)
   #:use-module (gnu packages xorg)
   #:use-module (gnu packages xdisorg)
diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm
index 73433e955f..44f94ff49e 100644
--- a/gnu/packages/vim.scm
+++ b/gnu/packages/vim.scm
@@ -26,7 +26,7 @@ (define-module (gnu packages vim)
   #:use-module (gnu packages ncurses)
   #:use-module (gnu packages perl)
   #:use-module (gnu packages admin) ; For GNU hostname
-  #:use-module (gnu packages tcsh))
+  #:use-module (gnu packages shells))
 
 (define-public vim
   (package