renamed some models/views