diff --git a/scipaperloader/blueprints/main.py b/scipaperloader/blueprints/main.py
index b7f2827..ace4e8b 100644
--- a/scipaperloader/blueprints/main.py
+++ b/scipaperloader/blueprints/main.py
@@ -6,14 +6,14 @@ bp = Blueprint("main", __name__)
 
 @bp.route("/")
 def index():
-    return render_template("index.html.jina")
+    return render_template("index.html.jinja")
 
 
 @bp.route("/logs")
 def logs():
-    return render_template("logs.html.jina", app_title="PaperScraper")
+    return render_template("logs.html.jinja", app_title="PaperScraper")
 
 
 @bp.route("/about")
 def about():
-    return render_template("about.html.jina", app_title="PaperScraper")
\ No newline at end of file
+    return render_template("about.html.jinja", app_title="PaperScraper")
\ No newline at end of file
diff --git a/scipaperloader/blueprints/papers.py b/scipaperloader/blueprints/papers.py
index fba87d3..0eba403 100644
--- a/scipaperloader/blueprints/papers.py
+++ b/scipaperloader/blueprints/papers.py
@@ -72,7 +72,7 @@ def list_papers():
     status_counts = {status: count for status, count in status_counts}
 
     return render_template(
-        "papers.html.jina",
+        "papers.html.jinja",
         papers=pagination.items,
         pagination=pagination,
         total_papers=total_papers,
@@ -137,4 +137,4 @@ def export_papers():
 @bp.route("/<int:paper_id>/detail")
 def paper_detail(paper_id):
     paper = PaperMetadata.query.get_or_404(paper_id)
-    return render_template("partials/paper_detail_modal.html.jina", paper=paper)
\ No newline at end of file
+    return render_template("partials/paper_detail_modal.html.jinja", paper=paper)
\ No newline at end of file
diff --git a/scipaperloader/blueprints/schedule.py b/scipaperloader/blueprints/schedule.py
index f83bb18..b76c764 100644
--- a/scipaperloader/blueprints/schedule.py
+++ b/scipaperloader/blueprints/schedule.py
@@ -72,7 +72,7 @@ def schedule():
     }
     volume = VolumeConfig.query.first()
     return render_template(
-        "schedule.html.jina",
+        "schedule.html.jinja",
         schedule=schedule,
         volume=volume.volume if volume else 0,
         app_title="PaperScraper",
diff --git a/scipaperloader/blueprints/upload.py b/scipaperloader/blueprints/upload.py
index 73fcf48..0466c35 100644
--- a/scipaperloader/blueprints/upload.py
+++ b/scipaperloader/blueprints/upload.py
@@ -32,19 +32,19 @@ def upload():
         duplicate_strategy = request.form.get("duplicate_strategy", "skip")
 
         if not file:
-            return render_template("upload.html.jina", error="No file selected.")
+            return render_template("upload.html.jinja", error="No file selected.")
 
         try:
             stream = codecs.iterdecode(file.stream, "utf-8")
             content = "".join(stream)
             df = pd.read_csv(StringIO(content), delimiter=delimiter)
         except Exception as e:
-            return render_template("upload.html.jina", error=f"Failed to read CSV file: {e}")
+            return render_template("upload.html.jinja", error=f"Failed to read CSV file: {e}")
 
         missing = REQUIRED_COLUMNS - set(df.columns)
         if missing:
             return render_template(
-                "upload.html.jina", error=f"Missing required columns: {', '.join(missing)}"
+                "upload.html.jinja", error=f"Missing required columns: {', '.join(missing)}"
             )
 
         # Optional: parse 'published_online' to date
@@ -126,7 +126,7 @@ def upload():
         except Exception as e:
             db.session.rollback()
             return render_template(
-                "upload.html.jina", error=f"Failed to save data to database: {e}"
+                "upload.html.jinja", error=f"Failed to save data to database: {e}"
             )
 
         # Prepare error samples for display
@@ -145,13 +145,13 @@ def upload():
             session["error_data"] = error_csv.getvalue()
 
         return render_template(
-            "upload.html.jina", 
+            "upload.html.jinja", 
             success=f"File processed! Added: {added_count}, Updated: {updated_count}, Skipped: {skipped_count}, Errors: {error_count}",
             error_message=error_message,
             error_samples=error_samples
         )
 
-    return render_template("upload.html.jina")
+    return render_template("upload.html.jinja")
 
 
 @bp.route("/download_error_log")
diff --git a/scipaperloader/templates/about.html.jinja b/scipaperloader/templates/about.html.jinja
index 58706ea..304ed8d 100644
--- a/scipaperloader/templates/about.html.jinja
+++ b/scipaperloader/templates/about.html.jinja
@@ -1,4 +1,4 @@
-{% extends "base.html" %} {% block content %}
+{% extends "base.html.jinja" %} {% block content %}
 <h1 class="mb-4">📘 About This App</h1>
 
 <p class="lead">
diff --git a/scipaperloader/templates/base.html.jinja b/scipaperloader/templates/base.html.jinja
index 9c2ec9e..4d098c4 100644
--- a/scipaperloader/templates/base.html.jinja
+++ b/scipaperloader/templates/base.html.jinja
@@ -13,9 +13,9 @@
 </head>
 
 <body>
-  {% include "nav.html" %}
+  {% include "nav.html.jinja" %}
   <main class="container my-5">{% block content %}{% endblock content %}</main>
-  {% include "footer.html" %}
+  {% include "footer.html.jinja" %}
 </body>
 
 </html>
\ No newline at end of file
diff --git a/scipaperloader/templates/index.html.jinja b/scipaperloader/templates/index.html.jinja
index 16c9cbd..44dc532 100644
--- a/scipaperloader/templates/index.html.jinja
+++ b/scipaperloader/templates/index.html.jinja
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "base.html.jinja" %}
 {% block content %}
 
 <div class="container text-center">
diff --git a/scipaperloader/templates/logger.html.jinja b/scipaperloader/templates/logger.html.jinja
index 5c0d6be..7880ea2 100644
--- a/scipaperloader/templates/logger.html.jinja
+++ b/scipaperloader/templates/logger.html.jinja
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "base.html.jinja" %}
 {% block content %}
 <h1>Activity Logs</h1>
 
diff --git a/scipaperloader/templates/papers.html.jinja b/scipaperloader/templates/papers.html.jinja
index c7187af..26e5d68 100644
--- a/scipaperloader/templates/papers.html.jinja
+++ b/scipaperloader/templates/papers.html.jinja
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "base.html.jinja" %}
 {% block title %}Papers{% endblock title %}
 {% block content %}
 
diff --git a/scipaperloader/templates/schedule.html.jinja b/scipaperloader/templates/schedule.html.jinja
index f51c3dd..80873d2 100644
--- a/scipaperloader/templates/schedule.html.jinja
+++ b/scipaperloader/templates/schedule.html.jinja
@@ -1,4 +1,4 @@
-{% extends "base.html" %} {% block content %}
+{% extends "base.html.jinja" %} {% block content %}
 <style>
   .timeline {
     display: flex;
diff --git a/scipaperloader/templates/upload.html.jinja b/scipaperloader/templates/upload.html.jinja
index e92763d..db7fa0b 100644
--- a/scipaperloader/templates/upload.html.jinja
+++ b/scipaperloader/templates/upload.html.jinja
@@ -1,4 +1,4 @@
-{% extends "base.html" %} {% block content %}
+{% extends "base.html.jinja" %} {% block content %}
 <h1>Welcome to SciPaperLoader</h1>
 
 {% if success %}