Renaming and rewriting a bit