Fix build warnings
Handle all name conflicts via TH instead of a remapping table

@pasberth @gregwebs
Bump for hackage