Fixed misnamed table fields
More fixes for under_score compliance