better renaming & cleanup