More refactoring, add _get_handle_name