Fix names in Data binder generators.

 Fixes issue #230, fixes issue #212