enforce new model naming, bugfixes validation