Replaced fully qualified class name through simple class name because of
23 chars limitation
Tags that are longer than 23 chars would now be shortened automatically