more text cleaning, renaming