Renaming and fixing small scripts