Replaced full qualified class names with short class names.