diff --git a/src/main/resources/fileTemplates/internal/animated_widget.dart.ft b/src/main/resources/fileTemplates/internal/animated_widget.dart.ft
index f853f20..ad9bbac 100644
--- a/src/main/resources/fileTemplates/internal/animated_widget.dart.ft
+++ b/src/main/resources/fileTemplates/internal/animated_widget.dart.ft
@@ -10,11 +10,11 @@ class ${CamelCaseName} extends StatefulWidget {
   const ${CamelCaseName}({Key? key}) : super(key: key);
 
   @override
-  _${CamelCaseName}State createState() => _${CamelCaseName}State();
+  State<${CamelCaseName}> createState() => _${CamelCaseName}State();
 }
 
 class _${CamelCaseName}State extends State<${CamelCaseName}> with SingleTickerProviderStateMixin {
-  AnimationController _controller;
+  late AnimationController _controller;
 
   @override
   void initState() {
diff --git a/src/main/resources/fileTemplates/internal/stateful_widget.dart.ft b/src/main/resources/fileTemplates/internal/stateful_widget.dart.ft
index 9d06bbf..b9e98a6 100644
--- a/src/main/resources/fileTemplates/internal/stateful_widget.dart.ft
+++ b/src/main/resources/fileTemplates/internal/stateful_widget.dart.ft
@@ -10,7 +10,7 @@ class ${CamelCaseName} extends StatefulWidget {
   const ${CamelCaseName}({Key? key}) : super(key: key);
 
   @override
-  _${CamelCaseName}State createState() => _${CamelCaseName}State();
+  State<${CamelCaseName}> createState() => _${CamelCaseName}State();
 }
 
 class _${CamelCaseName}State extends State<${CamelCaseName}> {