Cleanup
Rename popover class.