diff --git a/CHANGELOG b/CHANGELOG
index 68007cc6c..6c1850910 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -107,6 +107,8 @@ in C code
   such signals and simply not install a signal handler for floating point
   exceptions. This could lead to such signals being generated and caught by
   another signal handler if ECL was used as an embedded library.
+- Non-standard package nicknames (USER for COMMON-LISP-USER and LISP for
+  COMMON-LISP) have been removed.
 * 16.1.3 changes since 16.1.2
 ** Announcement
 Dear Community,
diff --git a/src/c/main.d b/src/c/main.d
index 508d289a3..5dd512c0c 100755
--- a/src/c/main.d
+++ b/src/c/main.d
@@ -295,7 +295,6 @@ ecl_def_ct_base_string(str_LISP,"LISP",4,static,const);
 ecl_def_ct_base_string(str_c,"C",1,static,const);
 ecl_def_ct_base_string(str_compiler,"COMPILER",8,static,const);
 ecl_def_ct_base_string(str_ffi,"FFI",3,static,const);
-ecl_def_ct_base_string(str_user,"USER",4,static,const);
 ecl_def_ct_base_string(str_keyword,"KEYWORD",7,static,const);
 ecl_def_ct_base_string(str_si,"SI",2,static,const);
 ecl_def_ct_base_string(str_sys,"SYS",3,static,const);
@@ -574,12 +573,12 @@ cl_boot(int argc, char **argv)
 
   cl_core.lisp_package =
     ecl_make_package(str_common_lisp,
-                     cl_list(2, str_cl, str_LISP),
+                     cl_list(1, str_cl),
                      ECL_NIL,
                      ECL_NIL);
   cl_core.user_package =
     ecl_make_package(str_common_lisp_user,
-                     cl_list(2, str_cl_user, str_user),
+                     cl_list(1, str_cl_user),
                      ecl_list1(cl_core.lisp_package),
                      ECL_NIL);
   cl_core.keyword_package =
diff --git a/src/compile.lsp.in b/src/compile.lsp.in
index 970004a99..7d0a681cf 100755
--- a/src/compile.lsp.in
+++ b/src/compile.lsp.in
@@ -56,7 +56,7 @@
 ;;; * Trick to make names shorter in C files
 ;;;
 (si::package-lock "CL" nil)
-(rename-package "CL" "CL" '("COMMON-LISP" "LISP"))
+(rename-package "CL" "CL" '("COMMON-LISP"))
 
 ;;;
 ;;; * Add include path to not yet installed headers, and remove include flag
diff --git a/src/doc/manual/standards/packages.txi b/src/doc/manual/standards/packages.txi
index 633b40452..c599e9d38 100644
--- a/src/doc/manual/standards/packages.txi
+++ b/src/doc/manual/standards/packages.txi
@@ -11,7 +11,8 @@ package is obtained when loading the ASDF library with @code{(require 'asdf)}.
 @caption{ECL packages}
 @multitable @columnfractions .25 .25 .2 .3
 @headitem Name @tab Nickname @tab In module @tab Description
-@item @code{COMMON-LISP} @tab @code{CL, LISP} @tab @code{ECL core} @tab Main Common Lisp package.
+@item @code{COMMON-LISP} @tab @code{CL} @tab @code{ECL core} @tab Main Common Lisp package.
+@item @code{COMMON-LISP-USER} @tab @code{CL-USER} @tab @code{ECL core} @tab User package.
 @item @code{CLOS} @tab @code{MOP} @tab @code{ECL core} @tab Symbols from the AMOP.
 @item @code{EXT} @tab @code{ } @tab @code{ECL core} @tab ECL extensions to the language & library.
 @item @code{SYSTEM} @tab @code{SI, SYS} @tab @code{ECL core} @tab Functions and variables internal to the implementation. Never to be used.
diff --git a/src/lsp/config.lsp.in b/src/lsp/config.lsp.in
index 7aadc51bc..cf10865b4 100644
--- a/src/lsp/config.lsp.in
+++ b/src/lsp/config.lsp.in
@@ -5,7 +5,7 @@
 ;;
 ;; Configuration file for ECL
 ;;
-(in-package "LISP")
+(in-package "COMMON-LISP")
 
 #+(and (not ecl-min) (not nacl) (not windows) (not mingw32) uname)
 (ffi:clines "
diff --git a/src/lsp/describe.lsp b/src/lsp/describe.lsp
index 0e3f9cc2f..aa3e59132 100644
--- a/src/lsp/describe.lsp
+++ b/src/lsp/describe.lsp
@@ -565,7 +565,7 @@ Prints information about OBJECT to STREAM."
              (values))))
 
 (defun help* (string &optional (package "CL"))
-  "Args: (string &optional (package-spec 'lisp))
+  "Args: (string &optional (package-spec 'common-lisp))
 ECL specific.
 Prints the documentation associated with those symbols in the specified
 package whose print names contain STRING as substring.  STRING may be a
diff --git a/src/lsp/top.lsp b/src/lsp/top.lsp
index d0aabb267..f37189ef9 100644
--- a/src/lsp/top.lsp
+++ b/src/lsp/top.lsp
@@ -628,7 +628,7 @@ Use special code 0 to cancel this operation.")
     (function (funcall *tpl-prompt-hook*))
     (t (fresh-line)
        (format t "~A~V,,,'>A "
-               (if (eq *package* (find-package 'user))
+               (if (eq *package* (find-package 'cl-user))
                    ""
                  (package-name *package*))
                (- *tpl-level* *step-level* -1)