Refactoring interaction and naming