Change view naming to be more consistent with model/collection names