Updated classes names and merged commits.