Fix issue in ObservableCollection. Add class names to several classes.