Fix handler_name and module_name options