ticket: 3 Model renamed