Add fixes for current mongo naming scheme