Bugs/reset and state names

It turns out what we want is just upperCase first letter rather than _.capitalize. 

Also, changed the collection view to call resetItems instead of removeAllItems