Updates for models and mongo. change a few names