Refactoring : rename some methods