Tackle issue #28 - Data provider name is not handled correctly.