Merge "Use Class#getSimpleName instead of KClass#getSimpleName"