Convert underscore to camel when returning rec

- Need to find a better place to keep this logic