Rename handlers into interfaces