Refactoring : naming classes and functions with more explicit names