Fixed datamodel naming an navigation