New post : rename + partial revert refactoring trick