Added renaming and rerouting