diff --git a/modules/swagger-core/src/main/java/io/swagger/v3/core/jackson/TypeNameResolver.java b/modules/swagger-core/src/main/java/io/swagger/v3/core/jackson/TypeNameResolver.java
index 808a6e94fb..0f60413515 100644
--- a/modules/swagger-core/src/main/java/io/swagger/v3/core/jackson/TypeNameResolver.java
+++ b/modules/swagger-core/src/main/java/io/swagger/v3/core/jackson/TypeNameResolver.java
@@ -60,7 +60,7 @@ protected String nameForClass(Class<?> cls, Set<Options> options) {
     }
 
     protected String getNameOfClass(Class<?> cls) {
-        return useFqn?cls.getName():cls.getSimpleName();
+        return useFqn ? cls.getName().replace("$", ".") : cls.getSimpleName();
     }
 
     protected String nameForGenericType(JavaType type, Set<Options> options) {