Use 2.0 tag instead of including in name