MongoDB Fixes

Fixing some naming issues.