Refactoring for better components naming