Some renaming and cleaning