diff --git a/sql-dump-splitter.py b/sql-dump-splitter.py
index aea1615..8bd6b1d 100644
--- a/sql-dump-splitter.py
+++ b/sql-dump-splitter.py
@@ -2,17 +2,34 @@
 # -*- coding: utf-8 -*-
 
 __author__ = "Davyd Maker"
-__version__ = "1.0"
+__version__ = "1.2"
 
 import os
 import argparse
 import time
-
-DEFAULT_SQL_CONDITIONS = ["DROP TABLE", "CREATE TABLE IF NOT EXISTS"]
-
-def save_file(content, directory, file_index):
+import re
+
+DEFAULT_SQL_CONDITIONS = ["DROP TABLE", "CREATE TABLE IF NOT EXISTS", "CREATE VIEW", "CREATE FUNCTION", "CREATE PROCEDURE"]
+
+def extract_name(line):
+    # Regex patterns to match table/view/function/procedure names
+    patterns = [
+        r'CREATE TABLE (\w+)',  # Match CREATE TABLE statements
+        r'CREATE VIEW (\w+)',   # Match CREATE VIEW statements
+        r'CREATE FUNCTION (\w+)',  # Match CREATE FUNCTION statements
+        r'CREATE PROCEDURE (\w+)',  # Match CREATE PROCEDURE statements
+        r'DROP TABLE (\w+)',  # Match DROP TABLE statements
+    ]
+    
+    for pattern in patterns:
+        match = re.search(pattern, line)
+        if match:
+            return match.group(1)
+    return None
+
+def save_file(content, directory, file_name):
     try:
-        file_path = os.path.join(directory, f'{file_index}.sql')
+        file_path = os.path.join(directory, f'{file_name}.sql')
         with open(file_path, 'w', encoding='utf-8') as file:
             file.write(''.join(content))
     except IOError as e:
@@ -37,29 +54,40 @@ def handle_line(line, ignore_blank_lines):
 def process_file(input_file_path, output_dir, trigger_count, ignore_blank_lines, sql_conditions):
     prepare_directory(output_dir)
     file_count = 0
+    current_content = []
+    current_file_name = None
+    condition_hit_count = 0
 
     start_time = time.time()
+    
     try:
         with open(input_file_path, 'r', encoding='utf-8') as file:
-            current_content = []
-            condition_hit_count = 0
-
             for line in file:
                 processed_line = handle_line(line, ignore_blank_lines)
                 if processed_line is None:
                     continue
 
+                name = extract_name(processed_line)
                 split, condition_hit_count = should_split(processed_line, sql_conditions, condition_hit_count, trigger_count)
+                
                 if split:
-                    save_file(current_content, output_dir, file_count)
-                    file_count += 1
-                    current_content = []
-                    condition_hit_count = 0
+                    if current_content:
+                        # Save the current content to the previous file name
+                        save_file(current_content, output_dir, current_file_name)
+                        file_count += 1
+                    
+                    # Set the new file name based on the extracted name
+                    current_file_name = name if name else f"file_{file_count}"  # Fallback if name extraction fails
+                    current_content = []  # Reset current content for the new file
+                    condition_hit_count = 0  # Reset hit count
+
                 current_content.append(processed_line)
 
-            if current_content:
-                save_file(current_content, output_dir, file_count)
+            # Save any remaining content in the last file
+            if current_content and current_file_name:
+                save_file(current_content, output_dir, current_file_name)
                 file_count += 1
+                
     except Exception as e:
         print(f"Error reading file {input_file_path}: {e}")