Clean up some missed bad behavior and renamed the script.