Update namespaces to use Models instead of EntityClasses.
Merge commit '9e26bae5b697678d29b093b7d34833aa9985ea6e'