diff --git a/CMakeLists.txt b/CMakeLists.txt
index b60e6e5..5992164 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,7 +6,7 @@ endif()
 
 # ############
 # Define Project
-project(triqs_ctseg-J VERSION 3.3.0 LANGUAGES C CXX)
+project(triqs_ctseg VERSION 3.3.0 LANGUAGES C CXX)
 get_directory_property(IS_SUBPROJECT PARENT_DIRECTORY)
 
 # ############
@@ -148,7 +148,7 @@ if(BUILD_DEBIAN_PACKAGE AND NOT IS_SUBPROJECT)
   set(CPACK_PACKAGE_NAME ${PROJECT_NAME})
   set(CPACK_GENERATOR "DEB")
   set(CPACK_PACKAGE_VERSION ${PROJECT_VERSION})
-  set(CPACK_PACKAGE_CONTACT "https://github.com/TRIQS/ctseg-J")
+  set(CPACK_PACKAGE_CONTACT "https://github.com/TRIQS/ctseg")
   execute_process(COMMAND dpkg --print-architecture OUTPUT_VARIABLE CMAKE_DEBIAN_PACKAGE_ARCHITECTURE OUTPUT_STRIP_TRAILING_WHITESPACE)
   set(CPACK_DEBIAN_PACKAGE_DEPENDS "triqs (>= 3.3)")
   set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)
diff --git a/README.md b/README.md
index f7ecffc..9ca8087 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-[![build](https://github.com/TRIQS/ctseg-J/workflows/build/badge.svg)](https://github.com/TRIQS/ctseg-J/actions?query=workflow%3Abuild)
+[![build](https://github.com/TRIQS/ctseg/workflows/build/badge.svg)](https://github.com/TRIQS/ctseg/actions?query=workflow%3Abuild)
 
 ## TRIQS segment picture solver with spin-spin interactions (CTSEG-J)
 
@@ -6,7 +6,7 @@ Copyright (C) 2024, N. Kavokine, H. Lu, N. Wentzell and O. Parcollet.
 
 ### Documentation
 
-For documentation and installation instructions see [triqs.github.io/ctseg-J](https://triqs.github.io/ctseg-J).
+For documentation and installation instructions see [triqs.github.io/ctseg](https://triqs.github.io/ctseg).
 
 ### License
 
diff --git a/c++/triqs_ctseg-J/CMakeLists.txt b/c++/triqs_ctseg/CMakeLists.txt
similarity index 100%
rename from c++/triqs_ctseg-J/CMakeLists.txt
rename to c++/triqs_ctseg/CMakeLists.txt
diff --git a/c++/triqs_ctseg-J/configuration.cpp b/c++/triqs_ctseg/configuration.cpp
similarity index 100%
rename from c++/triqs_ctseg-J/configuration.cpp
rename to c++/triqs_ctseg/configuration.cpp
diff --git a/c++/triqs_ctseg-J/configuration.hpp b/c++/triqs_ctseg/configuration.hpp
similarity index 98%
rename from c++/triqs_ctseg-J/configuration.hpp
rename to c++/triqs_ctseg/configuration.hpp
index ff715e4..f2bb93b 100644
--- a/c++/triqs_ctseg-J/configuration.hpp
+++ b/c++/triqs_ctseg/configuration.hpp
@@ -34,7 +34,7 @@ struct segment_t {
   bool J_c = false, J_cdag = false; // Whether c (resp cdag) is part of a S operator
 
   /// Length of segment (accounts for cyclicity : length from c to cdag possibly across 0/beta)
-  tau_t length() const { return tau_c - tau_cdag; };
+  [[nodiscard]] tau_t length() const { return tau_c - tau_cdag; };
 
   /// A segment [beta, 0] represent a full line
   static segment_t full_line() { return {tau_t::beta(), tau_t::zero()}; }
@@ -74,7 +74,7 @@ struct configuration_t {
   configuration_t(int n_color) : seglists(n_color) {}
 
   // Accessor number of colors
-  int n_color() const { return seglists.size(); }
+  [[nodiscard]] int n_color() const { return seglists.size(); }
 };
 
 // ===================  Functions to manipulate segments ===================
diff --git a/c++/triqs_ctseg-J/dets.hpp b/c++/triqs_ctseg/dets.hpp
similarity index 100%
rename from c++/triqs_ctseg-J/dets.hpp
rename to c++/triqs_ctseg/dets.hpp
diff --git a/c++/triqs_ctseg-J/inputs.cpp b/c++/triqs_ctseg/inputs.cpp
similarity index 100%
rename from c++/triqs_ctseg-J/inputs.cpp
rename to c++/triqs_ctseg/inputs.cpp
diff --git a/c++/triqs_ctseg-J/inputs.hpp b/c++/triqs_ctseg/inputs.hpp
similarity index 100%
rename from c++/triqs_ctseg-J/inputs.hpp
rename to c++/triqs_ctseg/inputs.hpp
diff --git a/c++/triqs_ctseg-J/invariants.cpp b/c++/triqs_ctseg/invariants.cpp
similarity index 100%
rename from c++/triqs_ctseg-J/invariants.cpp
rename to c++/triqs_ctseg/invariants.cpp
diff --git a/c++/triqs_ctseg-J/invariants.hpp b/c++/triqs_ctseg/invariants.hpp
similarity index 100%
rename from c++/triqs_ctseg-J/invariants.hpp
rename to c++/triqs_ctseg/invariants.hpp
diff --git a/c++/triqs_ctseg-J/logs.hpp b/c++/triqs_ctseg/logs.hpp
similarity index 100%
rename from c++/triqs_ctseg-J/logs.hpp
rename to c++/triqs_ctseg/logs.hpp
diff --git a/c++/triqs_ctseg-J/measures.hpp b/c++/triqs_ctseg/measures.hpp
similarity index 100%
rename from c++/triqs_ctseg-J/measures.hpp
rename to c++/triqs_ctseg/measures.hpp
diff --git a/c++/triqs_ctseg-J/measures/density.cpp b/c++/triqs_ctseg/measures/density.cpp
similarity index 100%
rename from c++/triqs_ctseg-J/measures/density.cpp
rename to c++/triqs_ctseg/measures/density.cpp
diff --git a/c++/triqs_ctseg-J/measures/density.hpp b/c++/triqs_ctseg/measures/density.hpp
similarity index 100%
rename from c++/triqs_ctseg-J/measures/density.hpp
rename to c++/triqs_ctseg/measures/density.hpp
diff --git a/c++/triqs_ctseg-J/measures/g_f_tau.cpp b/c++/triqs_ctseg/measures/g_f_tau.cpp
similarity index 100%
rename from c++/triqs_ctseg-J/measures/g_f_tau.cpp
rename to c++/triqs_ctseg/measures/g_f_tau.cpp
diff --git a/c++/triqs_ctseg-J/measures/g_f_tau.hpp b/c++/triqs_ctseg/measures/g_f_tau.hpp
similarity index 100%
rename from c++/triqs_ctseg-J/measures/g_f_tau.hpp
rename to c++/triqs_ctseg/measures/g_f_tau.hpp
diff --git a/c++/triqs_ctseg-J/measures/nn_static.cpp b/c++/triqs_ctseg/measures/nn_static.cpp
similarity index 100%
rename from c++/triqs_ctseg-J/measures/nn_static.cpp
rename to c++/triqs_ctseg/measures/nn_static.cpp
diff --git a/c++/triqs_ctseg-J/measures/nn_static.hpp b/c++/triqs_ctseg/measures/nn_static.hpp
similarity index 100%
rename from c++/triqs_ctseg-J/measures/nn_static.hpp
rename to c++/triqs_ctseg/measures/nn_static.hpp
diff --git a/c++/triqs_ctseg-J/measures/nn_tau.cpp b/c++/triqs_ctseg/measures/nn_tau.cpp
similarity index 100%
rename from c++/triqs_ctseg-J/measures/nn_tau.cpp
rename to c++/triqs_ctseg/measures/nn_tau.cpp
diff --git a/c++/triqs_ctseg-J/measures/nn_tau.hpp b/c++/triqs_ctseg/measures/nn_tau.hpp
similarity index 100%
rename from c++/triqs_ctseg-J/measures/nn_tau.hpp
rename to c++/triqs_ctseg/measures/nn_tau.hpp
diff --git a/c++/triqs_ctseg-J/measures/perturbation_order_histo.cpp b/c++/triqs_ctseg/measures/perturbation_order_histo.cpp
similarity index 100%
rename from c++/triqs_ctseg-J/measures/perturbation_order_histo.cpp
rename to c++/triqs_ctseg/measures/perturbation_order_histo.cpp
diff --git a/c++/triqs_ctseg-J/measures/perturbation_order_histo.hpp b/c++/triqs_ctseg/measures/perturbation_order_histo.hpp
similarity index 100%
rename from c++/triqs_ctseg-J/measures/perturbation_order_histo.hpp
rename to c++/triqs_ctseg/measures/perturbation_order_histo.hpp
diff --git a/c++/triqs_ctseg-J/measures/sign.cpp b/c++/triqs_ctseg/measures/sign.cpp
similarity index 100%
rename from c++/triqs_ctseg-J/measures/sign.cpp
rename to c++/triqs_ctseg/measures/sign.cpp
diff --git a/c++/triqs_ctseg-J/measures/sign.hpp b/c++/triqs_ctseg/measures/sign.hpp
similarity index 100%
rename from c++/triqs_ctseg-J/measures/sign.hpp
rename to c++/triqs_ctseg/measures/sign.hpp
diff --git a/c++/triqs_ctseg-J/measures/sperp_tau.cpp b/c++/triqs_ctseg/measures/sperp_tau.cpp
similarity index 100%
rename from c++/triqs_ctseg-J/measures/sperp_tau.cpp
rename to c++/triqs_ctseg/measures/sperp_tau.cpp
diff --git a/c++/triqs_ctseg-J/measures/sperp_tau.hpp b/c++/triqs_ctseg/measures/sperp_tau.hpp
similarity index 100%
rename from c++/triqs_ctseg-J/measures/sperp_tau.hpp
rename to c++/triqs_ctseg/measures/sperp_tau.hpp
diff --git a/c++/triqs_ctseg-J/measures/state_hist.cpp b/c++/triqs_ctseg/measures/state_hist.cpp
similarity index 100%
rename from c++/triqs_ctseg-J/measures/state_hist.cpp
rename to c++/triqs_ctseg/measures/state_hist.cpp
diff --git a/c++/triqs_ctseg-J/measures/state_hist.hpp b/c++/triqs_ctseg/measures/state_hist.hpp
similarity index 100%
rename from c++/triqs_ctseg-J/measures/state_hist.hpp
rename to c++/triqs_ctseg/measures/state_hist.hpp
diff --git a/c++/triqs_ctseg-J/moves.hpp b/c++/triqs_ctseg/moves.hpp
similarity index 100%
rename from c++/triqs_ctseg-J/moves.hpp
rename to c++/triqs_ctseg/moves.hpp
diff --git a/c++/triqs_ctseg-J/moves/insert_segment.cpp b/c++/triqs_ctseg/moves/insert_segment.cpp
similarity index 100%
rename from c++/triqs_ctseg-J/moves/insert_segment.cpp
rename to c++/triqs_ctseg/moves/insert_segment.cpp
diff --git a/c++/triqs_ctseg-J/moves/insert_segment.hpp b/c++/triqs_ctseg/moves/insert_segment.hpp
similarity index 100%
rename from c++/triqs_ctseg-J/moves/insert_segment.hpp
rename to c++/triqs_ctseg/moves/insert_segment.hpp
diff --git a/c++/triqs_ctseg-J/moves/insert_spin_segment.cpp b/c++/triqs_ctseg/moves/insert_spin_segment.cpp
similarity index 100%
rename from c++/triqs_ctseg-J/moves/insert_spin_segment.cpp
rename to c++/triqs_ctseg/moves/insert_spin_segment.cpp
diff --git a/c++/triqs_ctseg-J/moves/insert_spin_segment.hpp b/c++/triqs_ctseg/moves/insert_spin_segment.hpp
similarity index 100%
rename from c++/triqs_ctseg-J/moves/insert_spin_segment.hpp
rename to c++/triqs_ctseg/moves/insert_spin_segment.hpp
diff --git a/c++/triqs_ctseg-J/moves/move_segment.cpp b/c++/triqs_ctseg/moves/move_segment.cpp
similarity index 100%
rename from c++/triqs_ctseg-J/moves/move_segment.cpp
rename to c++/triqs_ctseg/moves/move_segment.cpp
diff --git a/c++/triqs_ctseg-J/moves/move_segment.hpp b/c++/triqs_ctseg/moves/move_segment.hpp
similarity index 100%
rename from c++/triqs_ctseg-J/moves/move_segment.hpp
rename to c++/triqs_ctseg/moves/move_segment.hpp
diff --git a/c++/triqs_ctseg-J/moves/regroup_segment.cpp b/c++/triqs_ctseg/moves/regroup_segment.cpp
similarity index 100%
rename from c++/triqs_ctseg-J/moves/regroup_segment.cpp
rename to c++/triqs_ctseg/moves/regroup_segment.cpp
diff --git a/c++/triqs_ctseg-J/moves/regroup_segment.hpp b/c++/triqs_ctseg/moves/regroup_segment.hpp
similarity index 100%
rename from c++/triqs_ctseg-J/moves/regroup_segment.hpp
rename to c++/triqs_ctseg/moves/regroup_segment.hpp
diff --git a/c++/triqs_ctseg-J/moves/regroup_spin_segment.cpp b/c++/triqs_ctseg/moves/regroup_spin_segment.cpp
similarity index 100%
rename from c++/triqs_ctseg-J/moves/regroup_spin_segment.cpp
rename to c++/triqs_ctseg/moves/regroup_spin_segment.cpp
diff --git a/c++/triqs_ctseg-J/moves/regroup_spin_segment.hpp b/c++/triqs_ctseg/moves/regroup_spin_segment.hpp
similarity index 100%
rename from c++/triqs_ctseg-J/moves/regroup_spin_segment.hpp
rename to c++/triqs_ctseg/moves/regroup_spin_segment.hpp
diff --git a/c++/triqs_ctseg-J/moves/remove_segment.cpp b/c++/triqs_ctseg/moves/remove_segment.cpp
similarity index 100%
rename from c++/triqs_ctseg-J/moves/remove_segment.cpp
rename to c++/triqs_ctseg/moves/remove_segment.cpp
diff --git a/c++/triqs_ctseg-J/moves/remove_segment.hpp b/c++/triqs_ctseg/moves/remove_segment.hpp
similarity index 100%
rename from c++/triqs_ctseg-J/moves/remove_segment.hpp
rename to c++/triqs_ctseg/moves/remove_segment.hpp
diff --git a/c++/triqs_ctseg-J/moves/remove_spin_segment.cpp b/c++/triqs_ctseg/moves/remove_spin_segment.cpp
similarity index 100%
rename from c++/triqs_ctseg-J/moves/remove_spin_segment.cpp
rename to c++/triqs_ctseg/moves/remove_spin_segment.cpp
diff --git a/c++/triqs_ctseg-J/moves/remove_spin_segment.hpp b/c++/triqs_ctseg/moves/remove_spin_segment.hpp
similarity index 100%
rename from c++/triqs_ctseg-J/moves/remove_spin_segment.hpp
rename to c++/triqs_ctseg/moves/remove_spin_segment.hpp
diff --git a/c++/triqs_ctseg-J/moves/split_segment.cpp b/c++/triqs_ctseg/moves/split_segment.cpp
similarity index 100%
rename from c++/triqs_ctseg-J/moves/split_segment.cpp
rename to c++/triqs_ctseg/moves/split_segment.cpp
diff --git a/c++/triqs_ctseg-J/moves/split_segment.hpp b/c++/triqs_ctseg/moves/split_segment.hpp
similarity index 100%
rename from c++/triqs_ctseg-J/moves/split_segment.hpp
rename to c++/triqs_ctseg/moves/split_segment.hpp
diff --git a/c++/triqs_ctseg-J/moves/split_spin_segment.cpp b/c++/triqs_ctseg/moves/split_spin_segment.cpp
similarity index 100%
rename from c++/triqs_ctseg-J/moves/split_spin_segment.cpp
rename to c++/triqs_ctseg/moves/split_spin_segment.cpp
diff --git a/c++/triqs_ctseg-J/moves/split_spin_segment.hpp b/c++/triqs_ctseg/moves/split_spin_segment.hpp
similarity index 100%
rename from c++/triqs_ctseg-J/moves/split_spin_segment.hpp
rename to c++/triqs_ctseg/moves/split_spin_segment.hpp
diff --git a/c++/triqs_ctseg-J/moves/swap_spin_lines.cpp b/c++/triqs_ctseg/moves/swap_spin_lines.cpp
similarity index 100%
rename from c++/triqs_ctseg-J/moves/swap_spin_lines.cpp
rename to c++/triqs_ctseg/moves/swap_spin_lines.cpp
diff --git a/c++/triqs_ctseg-J/moves/swap_spin_lines.hpp b/c++/triqs_ctseg/moves/swap_spin_lines.hpp
similarity index 100%
rename from c++/triqs_ctseg-J/moves/swap_spin_lines.hpp
rename to c++/triqs_ctseg/moves/swap_spin_lines.hpp
diff --git a/c++/triqs_ctseg-J/params.cpp b/c++/triqs_ctseg/params.cpp
similarity index 100%
rename from c++/triqs_ctseg-J/params.cpp
rename to c++/triqs_ctseg/params.cpp
diff --git a/c++/triqs_ctseg-J/params.hpp b/c++/triqs_ctseg/params.hpp
similarity index 100%
rename from c++/triqs_ctseg-J/params.hpp
rename to c++/triqs_ctseg/params.hpp
diff --git a/c++/triqs_ctseg-J/results.cpp b/c++/triqs_ctseg/results.cpp
similarity index 100%
rename from c++/triqs_ctseg-J/results.cpp
rename to c++/triqs_ctseg/results.cpp
diff --git a/c++/triqs_ctseg-J/results.hpp b/c++/triqs_ctseg/results.hpp
similarity index 100%
rename from c++/triqs_ctseg-J/results.hpp
rename to c++/triqs_ctseg/results.hpp
diff --git a/c++/triqs_ctseg-J/solver_core.cpp b/c++/triqs_ctseg/solver_core.cpp
similarity index 100%
rename from c++/triqs_ctseg-J/solver_core.cpp
rename to c++/triqs_ctseg/solver_core.cpp
diff --git a/c++/triqs_ctseg-J/solver_core.hpp b/c++/triqs_ctseg/solver_core.hpp
similarity index 100%
rename from c++/triqs_ctseg-J/solver_core.hpp
rename to c++/triqs_ctseg/solver_core.hpp
diff --git a/c++/triqs_ctseg-J/tau_t.hpp b/c++/triqs_ctseg/tau_t.hpp
similarity index 99%
rename from c++/triqs_ctseg-J/tau_t.hpp
rename to c++/triqs_ctseg/tau_t.hpp
index 6daafbf..5ea218f 100644
--- a/c++/triqs_ctseg-J/tau_t.hpp
+++ b/c++/triqs_ctseg/tau_t.hpp
@@ -39,7 +39,7 @@ class tau_t {
   /// Not for users. Use the factories
   tau_t(uint64_t n_) : n(n_) {}
   /// For test only, not for users. Use the factories
-  tau_t(double x) : n(0) {
+  tau_t(double x)  {
     if ((x > _beta || x < 0)) {
       throw std::invalid_argument("Time tau must be in the range [0, beta]");
     } else if (x == _beta)
diff --git a/c++/triqs_ctseg-J/util.hpp b/c++/triqs_ctseg/util.hpp
similarity index 100%
rename from c++/triqs_ctseg-J/util.hpp
rename to c++/triqs_ctseg/util.hpp
diff --git a/c++/triqs_ctseg-J/work_data.cpp b/c++/triqs_ctseg/work_data.cpp
similarity index 100%
rename from c++/triqs_ctseg-J/work_data.cpp
rename to c++/triqs_ctseg/work_data.cpp
diff --git a/c++/triqs_ctseg-J/work_data.hpp b/c++/triqs_ctseg/work_data.hpp
similarity index 100%
rename from c++/triqs_ctseg-J/work_data.hpp
rename to c++/triqs_ctseg/work_data.hpp
diff --git a/doc/documentation.rst b/doc/documentation.rst
index 355ca98..4046901 100644
--- a/doc/documentation.rst
+++ b/doc/documentation.rst
@@ -31,5 +31,5 @@ Reference manual
    :template: autosummary_module_template.rst
    :recursive:
 
-   triqs_ctseg-J.solver
+   triqs_ctseg.solver
 
diff --git a/doc/index.rst b/doc/index.rst
index 3dff148..d0a1245 100644
--- a/doc/index.rst
+++ b/doc/index.rst
@@ -28,7 +28,7 @@ The imaginary time action solved by CTSEG-J is of the form
       .. image:: _static/logo_github.png
          :width: 65%
          :align: center
-         :target: https://github.com/triqs/ctseg-J
+         :target: https://github.com/triqs/ctseg
 
 Here :math:`\beta` is the inverse temperature, :math:`a` denote orbital indices, :math:`\sigma` spin indices (:math:`\sigma = \uparrow, \downarrow`),
 :math:`n_a \equiv \sum_{\sigma} n_{a\sigma}`, :math:`s_a^{\xi} \equiv \frac{1}{2} \sum_{\sigma \sigma'} \overline{c}_{a\sigma}
diff --git a/doc/install.rst b/doc/install.rst
index b8dbf17..27d2bf7 100644
--- a/doc/install.rst
+++ b/doc/install.rst
@@ -19,13 +19,13 @@ Prerequisites
 Installation steps
 ------------------
 
-#. Download the source code of the latest stable version by cloning the ``TRIQS/ctseg-J`` repository from GitHub::
+#. Download the source code of the latest stable version by cloning the ``TRIQS/ctseg`` repository from GitHub::
 
-     $ git clone https://github.com/TRIQS/ctseg-J ctseg.src
+     $ git clone https://github.com/TRIQS/ctseg ctseg.src
 
 #. Create and move to a new directory where you will compile the code::
 
-     $ mkdir ctseg-J.build && cd ctseg-J.build
+     $ mkdir ctseg.build && cd ctseg.build
 
 #. Ensure that your shell contains the TRIQS environment variables by sourcing the ``triqsvars.sh`` file from your TRIQS installation::
 
@@ -33,7 +33,7 @@ Installation steps
 
 #. In the build directory call cmake, including any additional custom CMake options, see below::
 
-     $ cmake ../ctseg-J.src
+     $ cmake ../ctseg.src
 
 #. Compile the code, run the tests and install the application::
 
@@ -49,7 +49,7 @@ see :ref:`TRIQS website <triqslibs:versions>`.
 In particular the Major and Minor Version numbers have to be the same.
 To use a particular version, go into the directory with the sources, and look at all available versions::
 
-     $ cd ctseg-J.src && git tag
+     $ cd ctseg.src && git tag
 
 Checkout the version of the code that you want::
 
@@ -62,12 +62,12 @@ Custom CMake options
 
 The compilation of ``CTSEG-J`` can be configured using CMake-options::
 
-    cmake ../ctseg-J.src -DOPTION1=value1 -DOPTION2=value2 ...
+    cmake ../ctseg.src -DOPTION1=value1 -DOPTION2=value2 ...
 
 +-----------------------------------------------------------------+-----------------------------------------------+
 | Options                                                         | Syntax                                        |
 +=================================================================+===============================================+
-| Specify an installation path other than path_to_triqs           | -DCMAKE_INSTALL_PREFIX=path_to_ctseg-J          |
+| Specify an installation path other than path_to_triqs           | -DCMAKE_INSTALL_PREFIX=path_to_ctseg          |
 +-----------------------------------------------------------------+-----------------------------------------------+
 | Build in Debugging Mode                                         | -DCMAKE_BUILD_TYPE=Debug                      |
 +-----------------------------------------------------------------+-----------------------------------------------+
diff --git a/doc/issues.rst b/doc/issues.rst
index 33a21f9..2cf5638 100644
--- a/doc/issues.rst
+++ b/doc/issues.rst
@@ -4,7 +4,7 @@ Reporting issues
 ****************
 
 Please report all problems and bugs directly at the github issue page
-`<https://github.com/TRIQS/ctseg-J/issues>`_.  In order to make it easier for us
+`<https://github.com/TRIQS/ctseg/issues>`_.  In order to make it easier for us
 to solve the issue please follow these guidelines:
 
 #. In all cases specify which version of the application you are using. You can
diff --git a/packaging/TRIQS-ctseg-foss-2021b.eb.in b/packaging/TRIQS-ctseg-foss-2021b.eb.in
index 7db207b..a3555ee 100644
--- a/packaging/TRIQS-ctseg-foss-2021b.eb.in
+++ b/packaging/TRIQS-ctseg-foss-2021b.eb.in
@@ -3,19 +3,19 @@ easyblock = 'CMakeMake'
 name = 'TRIQS-ctseg'
 version = '@PROJECT_VERSION@'
 
-homepage = 'https://triqs.github.io/ctseg-J/'
+homepage = 'https://triqs.github.io/ctseg/'
 description = """
  PROVIDE HERE A DESCRIPTION OF YOUR APPLICATION
 """
 
-docurls = ['https://triqs.github.io/ctseg-J/%(version_major_minor)s.x/']
+docurls = ['https://triqs.github.io/ctseg/%(version_major_minor)s.x/']
 software_license = 'LicenseGPLv3'
 
 toolchain = {'name': 'foss', 'version': '2021b'}
 toolchainopts = {'pic': True, 'usempi': True}
 
-source_urls = ['https://github.com/TRIQS/ctseg-J/releases/download/%(version)s/']
-sources = ['ctseg-J-%(version)s.tar.gz']
+source_urls = ['https://github.com/TRIQS/ctseg/releases/download/%(version)s/']
+sources = ['ctseg-%(version)s.tar.gz']
 checksums = ['PUT HERE THE SHA256 OF THE RELEASE TARBALL']
 
 dependencies = [
diff --git a/python/triqs_ctseg-J/CMakeLists.txt b/python/triqs_ctseg/CMakeLists.txt
similarity index 100%
rename from python/triqs_ctseg-J/CMakeLists.txt
rename to python/triqs_ctseg/CMakeLists.txt
diff --git a/python/triqs_ctseg-J/__init__.py b/python/triqs_ctseg/__init__.py
similarity index 100%
rename from python/triqs_ctseg-J/__init__.py
rename to python/triqs_ctseg/__init__.py
diff --git a/python/triqs_ctseg-J/parameters_constr_params_t.rst b/python/triqs_ctseg/parameters_constr_params_t.rst
similarity index 100%
rename from python/triqs_ctseg-J/parameters_constr_params_t.rst
rename to python/triqs_ctseg/parameters_constr_params_t.rst
diff --git a/python/triqs_ctseg-J/parameters_solve_params_t.rst b/python/triqs_ctseg/parameters_solve_params_t.rst
similarity index 100%
rename from python/triqs_ctseg-J/parameters_solve_params_t.rst
rename to python/triqs_ctseg/parameters_solve_params_t.rst
diff --git a/python/triqs_ctseg-J/solver.py b/python/triqs_ctseg/solver.py
similarity index 100%
rename from python/triqs_ctseg-J/solver.py
rename to python/triqs_ctseg/solver.py
diff --git a/python/triqs_ctseg-J/solver_core_desc.py b/python/triqs_ctseg/solver_core_desc.py
similarity index 98%
rename from python/triqs_ctseg-J/solver_core_desc.py
rename to python/triqs_ctseg/solver_core_desc.py
index 118b8be..3d3cff9 100644
--- a/python/triqs_ctseg-J/solver_core_desc.py
+++ b/python/triqs_ctseg/solver_core_desc.py
@@ -1,5 +1,5 @@
 # Generated automatically using the command :
-# c++2py ../../c++/triqs_ctseg-J/solver_core.hpp -p --members_read_only -a triqs_ctseg -m solver_core -o solver_core --only="results_t solver_core" --moduledoc="The python module for triqs_ctseg" -C triqs -C nda_py --includes=../../c++ --includes=/usr/local/include/ --cxxflags="-std=c++20" --target_file_only
+# c++2py ../../c++/triqs_ctseg/solver_core.hpp -p --members_read_only -a triqs_ctseg -m solver_core -o solver_core --only="results_t solver_core" --moduledoc="The python module for triqs_ctseg" -C triqs -C nda_py --includes=../../c++ --includes=/usr/local/include/ --cxxflags="-std=c++20" --target_file_only
 from cpp2py.wrap_generator import *
 
 # The module
@@ -9,7 +9,7 @@
 module.add_imports(*['triqs.gf', 'triqs.gf.meshes', 'triqs.operators', 'triqs.stat.histograms', 'h5._h5py'])
 
 # Add here all includes
-module.add_include("triqs_ctseg-J/solver_core.hpp")
+module.add_include("triqs_ctseg/solver_core.hpp")
 
 # Add here anything to add in the C++ code at the start, e.g. namespace using
 module.add_preamble("""
diff --git a/python/triqs_ctseg-J/version.py.in b/python/triqs_ctseg/version.py.in
similarity index 100%
rename from python/triqs_ctseg-J/version.py.in
rename to python/triqs_ctseg/version.py.in
diff --git a/share/cmake/triqs_ctseg-J-config-version.cmake.in b/share/cmake/triqs_ctseg-config-version.cmake.in
similarity index 100%
rename from share/cmake/triqs_ctseg-J-config-version.cmake.in
rename to share/cmake/triqs_ctseg-config-version.cmake.in
diff --git a/share/cmake/triqs_ctseg-J-config.cmake.in b/share/cmake/triqs_ctseg-config.cmake.in
similarity index 100%
rename from share/cmake/triqs_ctseg-J-config.cmake.in
rename to share/cmake/triqs_ctseg-config.cmake.in
diff --git a/test/c++/anderson.cpp b/test/c++/anderson.cpp
index c063dd2..5bf8234 100644
--- a/test/c++/anderson.cpp
+++ b/test/c++/anderson.cpp
@@ -1,7 +1,7 @@
 #include <cmath>
 #include <triqs/test_tools/gfs.hpp>
 #include <triqs/test_tools/arrays.hpp>
-#include <triqs_ctseg-J/solver_core.hpp>
+#include <triqs_ctseg/solver_core.hpp>
 
 using triqs::operators::n;
 
diff --git a/test/c++/dynamical_U.cpp b/test/c++/dynamical_U.cpp
index e7e528a..f1491f3 100644
--- a/test/c++/dynamical_U.cpp
+++ b/test/c++/dynamical_U.cpp
@@ -1,6 +1,6 @@
 #include <cmath>
 #include <triqs/test_tools/gfs.hpp>
-#include <triqs_ctseg-J/solver_core.hpp>
+#include <triqs_ctseg/solver_core.hpp>
 
 using triqs::operators::n;
 TEST(CTSEGJ, Dynamical_U) {
diff --git a/test/c++/jperp.cpp b/test/c++/jperp.cpp
index 8f2e024..942f15e 100644
--- a/test/c++/jperp.cpp
+++ b/test/c++/jperp.cpp
@@ -1,6 +1,6 @@
 #include <cmath>
 #include <triqs/test_tools/gfs.hpp>
-#include <triqs_ctseg-J/solver_core.hpp>
+#include <triqs_ctseg/solver_core.hpp>
 
 using triqs::operators::n;
 
diff --git a/test/c++/segments.cpp b/test/c++/segments.cpp
index 159a6e5..95b7c0e 100644
--- a/test/c++/segments.cpp
+++ b/test/c++/segments.cpp
@@ -2,8 +2,8 @@
 
 #include <cmath>
 #include <triqs/test_tools/arrays.hpp>
-#include <triqs_ctseg-J/tau_t.hpp>
-#include <triqs_ctseg-J/configuration.hpp>
+#include <triqs_ctseg/tau_t.hpp>
+#include <triqs_ctseg/configuration.hpp>
 
 using vs_t = std::vector<segment_t>;
 
diff --git a/test/c++/spin_spin.cpp b/test/c++/spin_spin.cpp
index 6d230aa..6199c32 100644
--- a/test/c++/spin_spin.cpp
+++ b/test/c++/spin_spin.cpp
@@ -1,6 +1,6 @@
 #include <cmath>
 #include <triqs/test_tools/gfs.hpp>
-#include <triqs_ctseg-J/solver_core.hpp>
+#include <triqs_ctseg/solver_core.hpp>
 
 using triqs::operators::n;
 
diff --git a/test/c++/tau_t.cpp b/test/c++/tau_t.cpp
index 4bb7e8d..30147f4 100644
--- a/test/c++/tau_t.cpp
+++ b/test/c++/tau_t.cpp
@@ -2,7 +2,7 @@
 
 #include <cmath>
 #include <triqs/test_tools/arrays.hpp>
-#include <triqs_ctseg-J/tau_t.hpp>
+#include <triqs_ctseg/tau_t.hpp>
 
 TEST(tau, basic) {
 
diff --git a/test/python/ctint.ref.h5 b/test/python/ctint.ref.h5
index 2633c60..f50c9d1 100644
Binary files a/test/python/ctint.ref.h5 and b/test/python/ctint.ref.h5 differ
diff --git a/test/python/dimer.py b/test/python/dimer.py
index 5c3c63e..91e0d04 100644
--- a/test/python/dimer.py
+++ b/test/python/dimer.py
@@ -11,7 +11,7 @@
 import triqs.utility.mpi as mpi
 from triqs.utility.h5diff import h5diff
 
-from triqs_ctseg-J import Solver
+from triqs_ctseg import Solver
 
 from numpy import matrix, array, block, diag, eye
 from numpy.linalg import inv
diff --git a/test/python/multiorb.py b/test/python/multiorb.py
index 815bc70..c935b20 100644
--- a/test/python/multiorb.py
+++ b/test/python/multiorb.py
@@ -6,7 +6,7 @@
 from triqs.operators import *
 from h5 import *
 import numpy as np
-from triqs_ctseg-J import SolverCore as Solver
+from triqs_ctseg import SolverCore as Solver
 import h5
 from triqs.utility.h5diff import h5diff
 
diff --git a/test/python/py_spin_spin.py b/test/python/py_spin_spin.py
index d9849c6..8fd0259 100644
--- a/test/python/py_spin_spin.py
+++ b/test/python/py_spin_spin.py
@@ -6,7 +6,7 @@
 from triqs.operators import *
 import h5
 from triqs.utility.h5diff import h5diff
-from triqs_ctseg-J import SolverCore as Solver
+from triqs_ctseg import SolverCore as Solver
 
 # Parameters
 beta = 10
diff --git a/test/python/two_orbitals.py b/test/python/two_orbitals.py
index fef79c9..a83c750 100644
--- a/test/python/two_orbitals.py
+++ b/test/python/two_orbitals.py
@@ -9,7 +9,7 @@
 from h5 import *
 import numpy as np
 from triqs.utility.h5diff import h5diff
-from triqs_ctseg-J import SolverCore as Solver
+from triqs_ctseg import SolverCore as Solver
 
 #number of orbitals
 n_orb = 2