Rename script, small changes