diff --git a/SampleFiles/Tags/Generated/Analytics+GenAllScript.swift b/SampleFiles/Tags/Generated/Analytics+GenAllScript.swift
index 6d0cf11..376cb25 100644
--- a/SampleFiles/Tags/Generated/Analytics+GenAllScript.swift
+++ b/SampleFiles/Tags/Generated/Analytics+GenAllScript.swift
@@ -1,6 +1,5 @@
 // Generated by ResgenSwift.Analytics 2.1.0
 
-import MatomoTracker
 import FirebaseAnalytics
 
 // MARK: - Protocol
@@ -81,7 +80,7 @@ class MatomoAnalyticsManager: AnalyticsManagerProtocol {
 
 class FirebaseAnalyticsManager: AnalyticsManagerProtocol {
     func logScreen(name: String, path: String) {
-        var parameters = [
+        let parameters = [
             AnalyticsParameterScreenName: name as NSObject
         ]
 
@@ -98,8 +97,9 @@ class FirebaseAnalyticsManager: AnalyticsManagerProtocol {
         params: [String: Any]?
     ) {
         var parameters: [String:NSObject] = [
+            AnalyticsParameterItemName: name.replacingOccurrences(of: " ", with: "_") as NSObject,
+            AnalyticsParameterItemCategory: category as NSObject,
             "action": action as NSObject,
-            "category": category as NSObject,
         ]
 
         if let supplementaryParameters = params {
@@ -115,7 +115,7 @@ class FirebaseAnalyticsManager: AnalyticsManagerProtocol {
         }
 
         Analytics.logEvent(
-            name.replacingOccurrences(of: [" "], with: "_"),
+            AnalyticsEventSelectContent,
             parameters: parameters
         )
     }
@@ -139,13 +139,7 @@ class AnalyticsManager {
         isEnabled = enable
     }
 
-    func configure(siteId: String, url: String) {
-        managers.append(
-            MatomoAnalyticsManager(
-                siteId: siteId,
-                url: url
-            )
-        )
+    func configure() {
         managers.append(FirebaseAnalyticsManager())
     }
 
@@ -180,7 +174,7 @@ class AnalyticsManager {
     func logScreenS1DefOne(title: String) {
         logScreen(
             name: "s1 def one \(title)",
-            path: "s1_def_one/\(title)"
+            path: ""
         )
     }
 
@@ -201,7 +195,7 @@ class AnalyticsManager {
     func logScreenS2DefOne() {
         logScreen(
             name: "s2 def one",
-            path: "s2_def_one/"
+            path: ""
         )
     }
 }
diff --git a/SampleFiles/genAllRessources.sh b/SampleFiles/genAllRessources.sh
index b8e4930..3692591 100755
--- a/SampleFiles/genAllRessources.sh
+++ b/SampleFiles/genAllRessources.sh
@@ -54,7 +54,7 @@ swift run -c release ResgenSwift strings tags $FORCE_FLAG "./Tags/sampleTags.txt
 
 # Analytics
 swift run -c release ResgenSwift analytics $FORCE_FLAG "./Tags/sampleTags.yml" \
- --target "matomo firebase" \
+ --target "firebase" \
  --extension-output-path "./Tags/Generated" \
  --extension-name "Analytics" \
  --extension-suffix "GenAllScript"
diff --git a/Sources/ResgenSwift/Analytics/Generator/FirebaseGenerator.swift b/Sources/ResgenSwift/Analytics/Generator/FirebaseGenerator.swift
index e5aef8c..0cf312a 100644
--- a/Sources/ResgenSwift/Analytics/Generator/FirebaseGenerator.swift
+++ b/Sources/ResgenSwift/Analytics/Generator/FirebaseGenerator.swift
@@ -34,7 +34,7 @@ enum FirebaseGenerator {
     private static var logScreen: String {
         """
             func logScreen(name: String, path: String) {
-                var parameters = [
+                let parameters = [
                     AnalyticsParameterScreenName: name as NSObject
                 ]
 
@@ -56,8 +56,9 @@ enum FirebaseGenerator {
                 params: [String: Any]?
             ) {
                 var parameters: [String:NSObject] = [
+                    AnalyticsParameterItemName: name.replacingOccurrences(of: " ", with: "_") as NSObject,
+                    AnalyticsParameterItemCategory: category as NSObject,
                     "action": action as NSObject,
-                    "category": category as NSObject,
                 ]
 
                 if let supplementaryParameters = params {
@@ -73,7 +74,7 @@ enum FirebaseGenerator {
                 }
 
                 Analytics.logEvent(
-                    name.replacingOccurrences(of: [" "], with: "_"),
+                    AnalyticsEventSelectContent,
                     parameters: parameters
                 )
             }
diff --git a/Sources/ResgenSwift/Analytics/Parser/AnalyticsFileParser.swift b/Sources/ResgenSwift/Analytics/Parser/AnalyticsFileParser.swift
index 6168b73..acf3c6c 100644
--- a/Sources/ResgenSwift/Analytics/Parser/AnalyticsFileParser.swift
+++ b/Sources/ResgenSwift/Analytics/Parser/AnalyticsFileParser.swift
@@ -176,6 +176,14 @@ class AnalyticsFileParser {
                 }
 
                 definition.action = action
+            } else {
+                if let category = event.category {
+                    definition.category = category
+                }
+                
+                if let action = event.action {
+                    definition.action = action
+                }
             }
 
             return definition