diff --git a/pagure/templates/repo_info.html b/pagure/templates/repo_info.html
index fa3da23..39724f4 100644
--- a/pagure/templates/repo_info.html
+++ b/pagure/templates/repo_info.html
@@ -72,13 +72,13 @@
             </span>
             {% endif %}
             {% if not repo.is_fork %}
-            <span class="text-muted">
-            Created by
+            <div class="text-muted">Created {{repo.date_created|humanize}}</div>
+            <div class="text-muted">
+            Maintained by
             <a href="{{ url_for('ui_ns.view_user', username=repo.user.user)}}">
                 {{- repo.user.user -}}
             </a>
-            {{repo.date_created|humanize}}
-          </span>
+            </div>
             {% endif %}
           <div class="projectinfo my-3">
               {% if repo.description %}{{ repo.description | noJS | safe }}{% else %}-{% endif -%}
@@ -221,7 +221,7 @@
                                     </h4>
                                     {{ repo.user.fullname }}
                                   </div>
-                                  <div class="mr-auto align-self-center">main admin</div>
+                                  <div class="mr-auto align-self-center">maintainer</div>
                               </div>
                               {% for access in repo.contributors %}
                                 {% for user in repo.contributors[access] %}
diff --git a/pagure/templates/userdash_projects.html b/pagure/templates/userdash_projects.html
index 7ed2074..3c948a0 100644
--- a/pagure/templates/userdash_projects.html
+++ b/pagure/templates/userdash_projects.html
@@ -57,7 +57,7 @@
 
                     {% if acl %}
                         <i class="fa fa-user-secret pl-2 pr-1" title="acl"></i>
-                        <span>{{ acl if acl != 'main admin' else 'owner' }}</span>
+                        <span>{{ acl if acl != 'main admin' else 'maintainer' }}</span>
                     {% endif %}
 
                     {% if author %}
@@ -85,7 +85,7 @@
                           <div class="col pl-1">
                             <select name="acl" id="acls-selectize" placeholder="ACLs">
                               <option value=""></option>
-                              <option value="main admin" {% if acl == "main admin" %}selected="selected"{% endif %}>Owner</option>
+                              <option value="main admin" {% if acl == "main admin" %}selected="selected"{% endif %}>Maintainer</option>
                               <option value="admin" {% if acl == "admin" %}selected="selected"{% endif %}>Admin</option>
                               <option value="commit" {% if acl == "commit" %}selected="selected"{% endif %}>Commit</option>
                               <option value="ticket" {% if acl == "ticket" %}selected="selected"{% endif %}>Ticket</option>
@@ -234,7 +234,7 @@
                     {% endif %}
                     {% if r["access"] %}
                     <span class="btn btn-outline-secondary border-0 opacity-100 font-size-09 disabled font-weight-bold">
-                      <span class="fa fa-user-secret fa-fw"></span>{{r["access"] if r["access"] != "main admin" else "owner"}}
+                      <span class="fa fa-user-secret fa-fw"></span>{{r["access"] if r["access"] != "main admin" else "maintainer"}}
                     </span>
                     {% endif %}
                   {# <div class="btn-group mr-2">