Fix scripts to reflect module changes