diff --git a/rivetenv.csh.in b/rivetenv.csh.in
--- a/rivetenv.csh.in
+++ b/rivetenv.csh.in
@@ -1,55 +1,55 @@
 ## These variables need to exist
 set prefix=@prefix@
 set exec_prefix=@exec_prefix@
 set datarootdir=@datarootdir@
 
 ## Try to automatically work out the YODA Python path
 set YODA_PYTHONPATH="@YODA_PYTHONPATH@"
 test -n "$YODA_PYTHONPATH" || (which yoda-config > /dev/null) && set YODA_PYTHONPATH="`yoda-config --pythonpath`"
 test -n "$YODA_PYTHONPATH" || echo "yoda-config could not be found: you may need to manually set paths to libYODA and the yoda Python package" 1>&2
 
 setenv PATH "$exec_prefix/bin:@YODABINPATH@:$PATH"
 
 if ($?@LIBPATHVARNAME@) then
-setenv @LIBPATHVARNAME@ "@libdir@:@YODALIBPATH@:@HEPMCLIBPATH@:@FASTJETLIBPATH@:@FJCONTRIBPATH@:$@LIBPATHVARNAME@"
+setenv @LIBPATHVARNAME@ "@libdir@:@YODALIBPATH@:@HEPMCLIBPATH@:@FASTJETLIBPATH@:@FJCONTRIBLIBPATH@:$@LIBPATHVARNAME@"
 else
-setenv @LIBPATHVARNAME@ "@libdir@:@YODALIBPATH@:@HEPMCLIBPATH@:@FASTJETLIBPATH@:FJCONTRIBPATH@"
+setenv @LIBPATHVARNAME@ "@libdir@:@YODALIBPATH@:@HEPMCLIBPATH@:@FASTJETLIBPATH@:@FJCONTRIBLIBPATH@"
 endif
 
 if ($?PYTHONPATH) then
 setenv PYTHONPATH "@RIVET_PYTHONPATH@:${YODA_PYTHONPATH}:$PYTHONPATH"
 else
 setenv PYTHONPATH "@RIVET_PYTHONPATH@:$YODA_PYTHONPATH"
 endif
 
 if ($?TEXMFHOME) then
 setenv TEXMFHOME "@datadir@/Rivet/texmf:$TEXMFHOME"
 else
 setenv TEXMFHOME "@datadir@/Rivet/texmf"
 endif
 
 if ($?HOMETEXMF) then
 setenv HOMETEXMF "@datadir@/Rivet/texmf:$HOMETEXMF"
 else
 setenv HOMETEXMF "@datadir@/Rivet/texmf"
 endif
 
 if ($?TEXMFCNF) then
 setenv TEXMFCNF "@datadir@/Rivet/texmf/cnf:$TEXMFCNF"
 else
 setenv TEXMFCNF "@datadir@/Rivet/texmf/cnf:"
 endif
 
 if ($?TEXINPUTS) then
 setenv TEXINPUTS "@datadir@/Rivet/texmf/tex//:$TEXINPUTS"
 else
 setenv TEXINPUTS "@datadir@/Rivet/texmf/tex//:"
 endif
 
 if ($?LATEXINPUTS) then
 setenv LATEXINPUTS "@datadir@/Rivet/texmf/tex//:$LATEXINPUTS"
 else
 setenv LATEXINPUTS "@datadir@/Rivet/texmf/tex//:"
 endif
 
 unset YODA_PYTHONPATH
diff --git a/rivetenv.sh.in b/rivetenv.sh.in
--- a/rivetenv.sh.in
+++ b/rivetenv.sh.in
@@ -1,25 +1,25 @@
 ## These variables need to exist
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 datarootdir=@datarootdir@
 
 ## Try to automatically work out the YODA Python path
 YODA_PYTHONPATH="@YODA_PYTHONPATH@"
 test -n "$YODA_PYTHONPATH" || { (which yoda-config > /dev/null) && YODA_PYTHONPATH=`yoda-config --pythonpath`; }
 test -n "$YODA_PYTHONPATH" || echo "yoda-config could not be found: you may need to manually set paths to libYODA and the yoda Python package" 1>&2
 
 export PATH="$exec_prefix/bin:@YODABINPATH@:$PATH"
-export @LIBPATHVARNAME@="@libdir@:@YODALIBPATH@:@HEPMCLIBPATH@:@FASTJETLIBPATH@:@FJCONTRIBPATH@:$@LIBPATHVARNAME@"
+export @LIBPATHVARNAME@="@libdir@:@YODALIBPATH@:@HEPMCLIBPATH@:@FASTJETLIBPATH@:@FJCONTRIBLIBPATH@:$@LIBPATHVARNAME@"
 export PYTHONPATH="@RIVET_PYTHONPATH@:$YODA_PYTHONPATH:$PYTHONPATH"
 
 export TEXMFHOME="@datadir@/Rivet/texmf:$TEXMFHOME"
 export HOMETEXMF="@datadir@/Rivet/texmf:$HOMETEXMF"
 export TEXMFCNF="@datadir@/Rivet/texmf/cnf:$TEXMFCNF"
 export TEXINPUTS="@datadir@/Rivet/texmf/tex//:$TEXINPUTS"
 export LATEXINPUTS="@datadir@/Rivet/texmf/tex//:$LATEXINPUTS"
 
 if (complete &> /dev/null); then
     test -e "@datadir@/Rivet/rivet-completion" && source "@datadir@/Rivet/rivet-completion"
 fi
 
 unset YODA_PYTHONPATH