Name change and clean up script