Updated all scripts to match the same pattern