modified model according to naming convensions