Refactor ItemView references to ChildView

This is a fork of #972. The old PR was initially based off of master, this one is based off of v2.0