Refactor method / interface name