Fix scripts for new packages and hydro
Rename to something a bit less groovy