renaming and filename cleanup