diff --git a/src/T2K/CMakeLists.txt b/src/T2K/CMakeLists.txt
index 2cc51ed..0748ca9 100644
--- a/src/T2K/CMakeLists.txt
+++ b/src/T2K/CMakeLists.txt
@@ -1,122 +1,122 @@
 # Copyright 2016 L. Pickering, P Stowell, R. Terri, C. Wilkinson, C. Wret
 
 ################################################################################
 #    This file is part of NUISANCE.
 #
 #    NUISANCE is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
 #    the Free Software Foundation, either version 3 of the License, or
 #    (at your option) any later version.
 #
 #    NUISANCE is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
 #    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 #    GNU General Public License for more details.
 #
 #    You should have received a copy of the GNU General Public License
 #    along with NUISANCE.  If not, see <http://www.gnu.org/licenses/>.
 ################################################################################
 set(IMPLFILES
 T2K_CC0pi_XSec_H2O_2DPcos_anu.cxx
 T2K_NuMu_CC0pi_OC_XSec_2DPcos.cxx
 T2K_NuMu_CC0pi_OC_XSec_2DPcos_joint.cxx
 T2K_NuMuAntiNuMu_CC0pi_CH_XSec_2DPcos.cxx
 T2K_NuMuAntiNuMu_CC0pi_CH_XSec_2DPcos_joint.cxx
 T2K_CC0pi_XSec_2DPcos_nu_I.cxx
 T2K_CC0pi_XSec_2DPcos_nu_II.cxx
 T2K_CCinc_XSec_2DPcos_nu_nonuniform.cxx
 T2K_nueCCinc_XSec_1Dpe.cxx
 T2K_nueCCinc_XSec_1Dthe.cxx
 T2K_nueCCinc_XSec_1Dpe_joint.cxx
 T2K_nueCCinc_XSec_1Dthe_joint.cxx
 T2K_nueCCinc_XSec_joint.cxx
 
 T2K_CC1pip_CH_XSec_2Dpmucosmu_nu.cxx
 T2K_CC1pip_CH_XSec_1Dppi_nu.cxx
 T2K_CC1pip_CH_XSec_1Dthpi_nu.cxx
 T2K_CC1pip_CH_XSec_1Dthmupi_nu.cxx
 T2K_CC1pip_CH_XSec_1DQ2_nu.cxx
 T2K_CC1pip_CH_XSec_1DAdlerPhi_nu.cxx
 T2K_CC1pip_CH_XSec_1DCosThAdler_nu.cxx
 
 T2K_CC1pip_H2O_XSec_1DEnuDelta_nu.cxx
 T2K_CC1pip_H2O_XSec_1DEnuMB_nu.cxx
 T2K_CC1pip_H2O_XSec_1Dcosmu_nu.cxx
 T2K_CC1pip_H2O_XSec_1Dcosmupi_nu.cxx
 T2K_CC1pip_H2O_XSec_1Dcospi_nu.cxx
 T2K_CC1pip_H2O_XSec_1Dpmu_nu.cxx
 T2K_CC1pip_H2O_XSec_1Dppi_nu.cxx
 
 T2K_CC0pinp_STV_XSec_1Ddpt_nu.cxx
 T2K_CC0pinp_STV_XSec_1Ddphit_nu.cxx
 T2K_CC0pinp_STV_XSec_1Ddat_nu.cxx
-T2K_CC0pi1p_XSec_3DPcoscos_nu_nonuniform.cxx
+T2K_CC0T2K_CC0piWithProtons_2018_multidif_0p_1p_Np.cxx
 T2K_CC0pinp_ifk_XSec_3Dinfp_nu.cxx
 T2K_CC0pinp_ifk_XSec_3Dinfa_nu.cxx
 T2K_CC0pinp_ifk_XSec_3Dinfip_nu.cxx
 T2K_SignalDef.cxx
 )
 
 set(HEADERFILES
 T2K_CC0pi_XSec_H2O_2DPcos_anu.h
 T2K_NuMu_CC0pi_OC_XSec_2DPcos.h
 T2K_NuMu_CC0pi_OC_XSec_2DPcos_joint.h
 T2K_NuMuAntiNuMu_CC0pi_CH_XSec_2DPcos.h
 T2K_NuMuAntiNuMu_CC0pi_CH_XSec_2DPcos_joint.h
 T2K_CC0pi_XSec_2DPcos_nu_I.h
 T2K_CC0pi_XSec_2DPcos_nu_II.h
 T2K_CCinc_XSec_2DPcos_nu_nonuniform.h
 T2K_nueCCinc_XSec_1Dpe.h
 T2K_nueCCinc_XSec_1Dthe.h
 T2K_nueCCinc_XSec_1Dpe_joint.h
 T2K_nueCCinc_XSec_1Dthe_joint.h
 T2K_nueCCinc_XSec_joint.h
 
 T2K_CC1pip_CH_XSec_2Dpmucosmu_nu.h
 T2K_CC1pip_CH_XSec_1Dppi_nu.h
 T2K_CC1pip_CH_XSec_1Dthpi_nu.h
 T2K_CC1pip_CH_XSec_1Dthmupi_nu.h
 T2K_CC1pip_CH_XSec_1DQ2_nu.h
 T2K_CC1pip_CH_XSec_1DAdlerPhi_nu.h
 T2K_CC1pip_CH_XSec_1DCosThAdler_nu.h
 
 T2K_CC1pip_H2O_XSec_1DEnuDelta_nu.h
 T2K_CC1pip_H2O_XSec_1DEnuMB_nu.h
 T2K_CC1pip_H2O_XSec_1Dcosmu_nu.h
 T2K_CC1pip_H2O_XSec_1Dcosmupi_nu.h
 T2K_CC1pip_H2O_XSec_1Dcospi_nu.h
 T2K_CC1pip_H2O_XSec_1Dpmu_nu.h
 T2K_CC1pip_H2O_XSec_1Dppi_nu.h
 
 T2K_CC0pinp_STV_XSec_1Ddpt_nu.h
 T2K_CC0pinp_STV_XSec_1Ddphit_nu.h
 T2K_CC0pinp_STV_XSec_1Ddat_nu.h
-T2K_CC0pi1p_XSec_3DPcoscos_nu_nonuniform.h
+T2K_CC0T2K_CC0piWithProtons_2018_multidif_0p_1p_Np.h
 T2K_CC0pinp_ifk_XSec_3Dinfp_nu.h
 T2K_CC0pinp_ifk_XSec_3Dinfa_nu.h
 T2K_CC0pinp_ifk_XSec_3Dinfip_nu.h
 T2K_SignalDef.h
 )
 
 set(LIBNAME expT2K)
 
 if(CMAKE_BUILD_TYPE MATCHES DEBUG)
   add_library(${LIBNAME} STATIC ${IMPLFILES})
 else(CMAKE_BUILD_TYPE MATCHES RELEASE)
   add_library(${LIBNAME} SHARED ${IMPLFILES})
 endif()
 
 include_directories(${MINIMUM_INCLUDE_DIRECTORIES})
 
 set_target_properties(${LIBNAME} PROPERTIES VERSION
   "${NUISANCE_VERSION_MAJOR}.${NUISANCE_VERSION_MINOR}.${NUISANCE_VERSION_REVISION}")
 #set_target_properties(${LIBNAME} PROPERTIES LINK_FLAGS ${ROOT_LD_FLAGS})
 if(DEFINED PROJECTWIDE_EXTRA_DEPENDENCIES)
   add_dependencies(${LIBNAME} ${PROJECTWIDE_EXTRA_DEPENDENCIES})
 endif()
 
 install(TARGETS ${LIBNAME} DESTINATION lib)
 #Can uncomment this to install the headers... but is it really neccessary?
 install(FILES ${HEADERFILES} DESTINATION include/T2K)
 
 set(MODULETargets ${MODULETargets} ${LIBNAME} PARENT_SCOPE)