Fix all camelcase issues
Fix payment.hs