Underscore to Camel
Fixed name
Added correct datetime handling