Fixed incorrect name spaces for models

Models were in incorrect name spaces