Corrected Model namespaces and use statements