diff --git a/app/developer/templates/developer/client_details/base.html b/app/developer/templates/developer/client_details/base.html
index a59fee9f..43c82830 100644
--- a/app/developer/templates/developer/client_details/base.html
+++ b/app/developer/templates/developer/client_details/base.html
@@ -14,7 +14,7 @@
       <div class="list-group list-group-transparent mb-0">
         <a href="{{ url_for('developer.client_detail', client_id=client.id) }}"
            class="list-group-item list-group-item-action {{ 'active' if client_details_page == 'basic_info' }}">
-          <span class="icon mr-3"><i class="fe fe-flag"></i></span>Basic Info
+          <span class="icon mr-3"><i class="fe fe-flag"></i></span>App Info
         </a>
 
         <a href="{{ url_for('developer.client_detail_oauth_setting', client_id=client.id) }}"
diff --git a/app/developer/templates/developer/client_details/basic_info.html b/app/developer/templates/developer/client_details/basic_info.html
index 4dd55729..c48af389 100644
--- a/app/developer/templates/developer/client_details/basic_info.html
+++ b/app/developer/templates/developer/client_details/basic_info.html
@@ -10,7 +10,7 @@
         Please head to our
         <a href="http://docs.simplelogin.io" target="_blank" rel="noopener">
         documentation <i class="fe fe-external-link"></i></a>
-        to see how to add SIWSL into your website/app.
+        to see how to add SIWSL into your app.
       </p>
 
       <button type="button" class="close" data-dismiss="alert" aria-label="Close">
@@ -23,7 +23,7 @@
         action="{{ url_for('developer.client_detail', client_id=client.id, action="edit") }}">
     {{ form.csrf_token }}
 
-    <h3>Website/App Info</h3>
+    <h3>App Info</h3>
     <div class="form-group">
       <label class="form-label">Name</label>
       {{ form.name(class="form-control", value=client.name) }}
@@ -59,7 +59,7 @@
 {#    {{ approval_form.csrf_token }}#}
 {##}
 {#    <div class="form-group">#}
-{#      <label class="form-label">Tell us about your website/app</label>#}
+{#      <label class="form-label">Tell us about your app</label>#}
 {#      {{ approval_form.description(#}
 {#          class="form-control", rows="10",#}
 {#          placeholder="This information is used for approving your application. Please give us as much info as you can, for example where you plan to use SimpleLogin, for which community, etc."#}
diff --git a/app/developer/templates/developer/client_details/oauth_setting.html b/app/developer/templates/developer/client_details/oauth_setting.html
index ed0d4c9a..c4c87cf9 100644
--- a/app/developer/templates/developer/client_details/oauth_setting.html
+++ b/app/developer/templates/developer/client_details/oauth_setting.html
@@ -56,7 +56,7 @@
             SimpleLogin <b>whitelists</b> localhost (unlike Facebook).
           </p>
           <p>
-            You DO need to add your <b>redirect_uri</b> once your website/app goes live (i.e. deployed on production).
+            You DO need to add your <b>redirect_uri</b> once your app goes live (i.e. deployed on production).
           </p>
           <p>
             The <b>redirect_uri</b> needs to be <b>HTTPS</b> for security reason.
diff --git a/app/developer/templates/developer/index.html b/app/developer/templates/developer/index.html
index b205a952..378def52 100644
--- a/app/developer/templates/developer/index.html
+++ b/app/developer/templates/developer/index.html
@@ -44,7 +44,7 @@
     <div class="col">
       <div class="btn-group" role="group" aria-label="Basic example">
         <a href="{{ url_for('developer.new_client') }}" class="btn btn-primary">
-          Create new website/app
+          New app
         </a>
         <a href="https://docs.simplelogin.io" target="_blank" class="ml-2 btn btn-secondary">
           Docs <i class="fe fe-external-link"></i>
diff --git a/app/developer/templates/developer/new_client.html b/app/developer/templates/developer/new_client.html
index cd644eb5..1667e607 100644
--- a/app/developer/templates/developer/new_client.html
+++ b/app/developer/templates/developer/new_client.html
@@ -10,7 +10,7 @@
   <div class="card">
     <div class="card-body">
       <h1 class="h3">Create new app</h1>
-      <p>An app can be a website, a SPA webapp or a mobile application</p>
+      <p>A SimpleLogin app can be a website, a SPA webapp or a mobile application</p>
       <p>Let's get started integrating SimpleLogin into your app! </p>
 
       <form method="post" enctype="multipart/form-data">