Minor Adjustments on mongodb field names