diff --git a/app/models.py b/app/models.py
index 34173d0f..8bbfb665 100644
--- a/app/models.py
+++ b/app/models.py
@@ -1570,7 +1570,7 @@ class Corpus(HashidMixin, db.Model):
 
     @property
     def analysis_url(self):
-        return url_for('corpora.analyse_corpus', corpus_id=self.id)
+        return url_for('corpora.analysis', corpus_id=self.id)
 
     @property
     def jsonpatch_path(self):
diff --git a/app/templates/_roadmap.html.j2 b/app/templates/_roadmap.html.j2
index 50cc18cd..eaf428ac 100644
--- a/app/templates/_roadmap.html.j2
+++ b/app/templates/_roadmap.html.j2
@@ -21,7 +21,7 @@
       <li class="tab disabled"><i class="material-icons">navigate_next</i></li>
       {% if corpus %}
       {% if corpus.files.all() %}
-      <li class="tab"><a{%if request.path == url_for('corpora.analyse_corpus', corpus_id=corpus.id) %} class="active"{% endif %} href="{{ url_for('corpora.analyse_corpus', corpus_id=corpus.id) }}" target="_self">Corpus analysis</a></li>
+      <li class="tab"><a{%if request.path == url_for('corpora.analysis', corpus_id=corpus.id) %} class="active"{% endif %} href="{{ url_for('corpora.analysis', corpus_id=corpus.id) }}" target="_self">Corpus analysis</a></li>
       {% else %}
       <li class="tab disabled tooltipped" data-tooltip="Create at least one corpus file first"><a>Corpus analysis</a></li>
       {% endif %}
diff --git a/app/templates/corpora/public_corpus.html.j2 b/app/templates/corpora/public_corpus.html.j2
index 531b3cea..31889203 100644
--- a/app/templates/corpora/public_corpus.html.j2
+++ b/app/templates/corpora/public_corpus.html.j2
@@ -14,7 +14,7 @@
           <a class="action-button btn waves-effect waves-light" data-action="unfollow-request"><i class="material-icons left outlined">close</i>Unfollow Corpus</a>
           {% endif %}
           {% if corpus.status.name in ['BUILT', 'STARTING_ANALYSIS_SESSION', 'RUNNING_ANALYSIS_SESSION', 'CANCELING_ANALYSIS_SESSION'] and current_user.is_following_corpus(corpus) %}
-          <a class="btn waves-effect waves-light" href="{{ url_for('corpora.analyse_corpus', corpus_id=corpus.id) }}">Analyze</a>
+          <a class="btn waves-effect waves-light" href="{{ url_for('corpora.analysis', corpus_id=corpus.id) }}">Analyze</a>
           {% endif %}
         </div>
       </div>