diff --git a/Makefile b/Makefile
index 3210ae335f53ca94486c87a4c5e094577bce5d75..1ebcaf909b7de086e4c4bb579657cc96a2a7b1c8 100644
--- a/Makefile
+++ b/Makefile
@@ -50,7 +50,7 @@ $(CMSSW):
 	scramv1 project CMSSW $(CMSSW)
 	cd $(CMSSW)/src && eval `scramv1 runtime -sh` && \
 	git clone https://github.com/cms-jet/JetToolbox.git JMEAnalysis/JetToolbox -b jetToolbox_120X && \
-	(cd JMEAnalysis/JetToolbox; patch -p1 ../../../../jetToolbox_120X.patch) && \
+	(cd JMEAnalysis/JetToolbox/python; patch -p1 <../../../../../jetToolbox_120X.patch) && \
 	git clone $(ORIGIN) Core
 
 tables:
diff --git a/darwin.xml.in b/darwin.xml.in
index 49896af108c40ac585dd543f0735c0e91d5b7da0..bd0ae76c02b6298a2055acb4ae0908a1410d151c 100644
--- a/darwin.xml.in
+++ b/darwin.xml.in
@@ -1,17 +1,16 @@
-<tool name="protodarwin" version="1.0"> <!-- TODO -->
+<tool name="darwin" version="1.0"> <!-- TODO -->
   <lib name="DarwinUserInfo"/>
   <lib name="DarwinMetaInfo"/>
   <lib name="DarwinOptions"/>
   <lib name="DarwinObjects"/>
   <info url="https://protodarwin.docs.cern.ch"/>
   <client>
-    <environment name="DARWIN" default="${CMAKE_SOURCE_DIR}"/>
-    <environment name="INCLUDE" default="${CMAKE_INSTALL_FULL_INCLUDEDIR}/ProtoDarwin"/>
+    <environment name="INCLUDE" default="${CMAKE_INSTALL_FULL_INCLUDEDIR}/Darwin"/>
     <environment name="LIBDIR" default="${CMAKE_INSTALL_FULL_LIBDIR}"/>
   </client>
   <use name="boost" />
   <use name="boost_program_options" />
-  <runtime name="DARWIN_BASE" value="${CMAKE_SOURCE_DIR}" type="path"/>
+  <runtime name="DARWIN_BASE" value="${CMAKE_SOURCE_DIR}/Darwin" type="path"/>
   <runtime name="DARWIN_FIRE_AND_FORGET" value="$CMSSW_BASE/lib/$SCRAM_ARCH" type="path"/><!-- TODO -->
   <runtime name="PATH" value="${CMAKE_INSTALL_FULL_BINDIR}" type="path"/>
   <runtime name="LD_LIBRARY_PATH" value="${CMAKE_INSTALL_FULL_LIBDIR}" type="path"/>