Refactoring for better name matching