Don't rely on backend class name for lookup
Merge master
Merge pull request #3507 from dimagi/backend-lookup

Don't rely on backend class name for lookup