Removed the use of Class<?>.getSimpleName 'cause it does not compile on 'html' version