diff --git a/chord_pipeline/core/telescope.py b/chord_pipeline/core/telescope.py
index d109623..e93bdc2 100644
--- a/chord_pipeline/core/telescope.py
+++ b/chord_pipeline/core/telescope.py
@@ -1,8 +1,8 @@
 """Simple models for the CHORD array.
 
 Identical to telescope objects in
-:py:mod:`drift.telescope.custom_disharray.core.PolarisedDishArray` and
-:py:mod:`drift.telescope.custom_disharray.core.PolarisedDishArraySurvey`,
+:py:mod:`drift.telescope.disharray.core.PolarisedDishArray` and
+:py:mod:`drift.telescope.disharray.core.PolarisedDishArraySurvey`,
 but with the following CHORD defaults:
     * Frequency channels set to the CHORD band (300-1500 MHz with 3276 channels)
     * Observatory location set to the approximate location of the CHORD array
@@ -25,8 +25,8 @@
 from caput import config
 
 from drift.core.telescope import PolarisedTelescope
-from drift.telescope.custom_disharray.core import MultiElevationSurvey, CustomDishArray
-from drift.telescope.custom_disharray.beams import rotate_thetaphi_beam
+from drift.telescope.disharray.core import MultiElevationSurvey, DishArrayMixin
+from drift.telescope.disharray.beams import rotate_thetaphi_beam
 
 # CHIME coordinates
 CHORD_LATITUDE = 49.3207092194
@@ -34,10 +34,10 @@
 CHORD_ALTITUDE = 555.372  # m
 
 
-class _CHORDDefaults(CustomDishArray, config.Reader, metaclass=abc.ABCMeta):
+class _CHORDDefaults(DishArrayMixin, config.Reader, metaclass=abc.ABCMeta):
     """Mixin for a CHORD 528-element array.
 
-    Identical to :py:class:`drift.telescope.custom_disharray.core.CustomDishArray`
+    Identical to :py:class:`drift.telescope.disharray.core.DishArrayMixin`
     but with defaults mentioned above.
     """
 
diff --git a/mkvenv.sh b/mkvenv.sh
index 074e718..696c7fb 100755
--- a/mkvenv.sh
+++ b/mkvenv.sh
@@ -73,6 +73,9 @@ else
 fi
 source $venv_path/bin/activate
 
+# Need to update these
+"$VENV_PATH/bin/python" -m pip install -U  "packaging>=24.2" trove-classifiers
+
 # Install the packages
 mkdir -p $code_path
 pip install --use-deprecated=legacy-resolver Cython
diff --git a/requirements.txt b/requirements.txt
index 47440ce..11619aa 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -3,5 +3,5 @@ h5py
 -e git+ssh://git@github.com/radiocosmology/caput#egg=caput
 -e git+ssh://git@github.com/radiocosmology/fluxcat#egg=fluxcat
 -e git+ssh://git@github.com/radiocosmology/cora#egg=cora
--e git+ssh://git@github.com/chord-observatory/driftscan@dish_array_merge#egg=driftscan
+-e git+ssh://git@github.com/chord-observatory/driftscan@dish_array_merge_main#egg=driftscan
 -e git+ssh://git@github.com/radiocosmology/draco#egg=draco