Renamed models to avoid conflicts with others