diff --git a/agent_based/checkpoint_inv_support.py b/agent_based/inv_checkpoint_support.py
similarity index 91%
rename from agent_based/checkpoint_inv_support.py
rename to agent_based/inv_checkpoint_support.py
index 6d702f20519d249f4d88d157dd5697d7ff10be83..9ab2cbaf069dfcc39da2b5fe1c93a7299259b2e0 100644
--- a/agent_based/checkpoint_inv_support.py
+++ b/agent_based/inv_checkpoint_support.py
@@ -52,7 +52,7 @@ class CheckpointLicensing(NamedTuple):
     activationstatus: str
 
 
-def parse_checkpoint_inv_licensing(string_table: List[StringTable]) -> List:
+def parse_inv_checkpoint_support(string_table: List[StringTable]) -> List:
     section = []
     for license in string_table[0]:
         license = CheckpointLicensing(*license)
@@ -61,7 +61,7 @@ def parse_checkpoint_inv_licensing(string_table: List[StringTable]) -> List:
     return section
 
 
-def inventory_checkpoint_licensing(section: List) -> InventoryResult:
+def inventory_checkpoint_support(section: List) -> InventoryResult:
     path = ['software', 'check_point', 'support']
 
     lic_state = {
@@ -91,8 +91,8 @@ def inventory_checkpoint_licensing(section: List) -> InventoryResult:
 
 
 register.snmp_section(
-    name='checkpoint_inv_licensing',
-    parse_function=parse_checkpoint_inv_licensing,
+    name='inv_checkpoint_support',
+    parse_function=parse_inv_checkpoint_support,
     fetch=[
         SNMPTree(
             base='.1.3.6.1.4.1.2620.1.6.18.2',  # CHECKPOINT-MIB::licensingAssetInfo
@@ -118,6 +118,6 @@ register.snmp_section(
 )
 
 register.inventory_plugin(
-    name='checkpoint_inv_licensing',
-    inventory_function=inventory_checkpoint_licensing,
+    name='inv_checkpoint_support',
+    inventory_function=inventory_checkpoint_support,
 )
diff --git a/inv_checkpoint_support.mkp b/inv_checkpoint_support.mkp
index 232cc4d7288ff6d93a3b29d1127b8fdb743f36f6..8ddedf9b367987419bb3510f5920d1948ee0565c 100644
Binary files a/inv_checkpoint_support.mkp and b/inv_checkpoint_support.mkp differ
diff --git a/packages/inv_checkpoint_support b/packages/inv_checkpoint_support
index dd64b6c7c93d041a6f9c8f9b80fafad213fa8d9c..e922cf6f0c0beabf1e9891439d2a9fb2568df948 100644
--- a/packages/inv_checkpoint_support
+++ b/packages/inv_checkpoint_support
@@ -2,8 +2,8 @@
  'description': 'SNMP inventory of Check Point Appliances for license/support '
                 'status\n',
  'download_url': 'https://thl-cmk.hopto.org',
- 'files': {'agent_based': ['checkpoint_inv_support.py'],
-           'web': ['plugins/views/checkpoint_support.py']},
+ 'files': {'agent_based': ['inv_checkpoint_support.py'],
+           'web': ['plugins/views/inv_checkpoint_support.py']},
  'name': 'inv_checkpoint_support',
  'num_files': 2,
  'title': 'Check Point appliance support inventory plugin',
diff --git a/web/plugins/views/checkpoint_support.py b/web/plugins/views/inv_checkpoint_support.py
similarity index 100%
rename from web/plugins/views/checkpoint_support.py
rename to web/plugins/views/inv_checkpoint_support.py