chore($handler-cleanup): rename handler files/classes to better describe roles #1157