model and other datastructurs, fix the names