Fix both view specs, force model names to be singular