calling it a day, minor fixes of wrong namespaces and model property
names