renamed models to end with 'Model' (to avoid conflicts in package names)