cleanup and better naming consistency - use "action" instead of "handler" and "route_name" instead of "action"