Rewrite renaming process with Marker: fixes #7