Some renaming and clean up