Renaming and cleaning
Rewrite: preparation for EIT rewriting