Refactoring : Change names of elements and so on...