Update tag list spec

* Wrapping class changed names