Move uppercasing up in the script.