diff --git a/djnro/local_settings.py.dist b/djnro/local_settings.py.dist
index df4bd610955b7c19819dc7e5bd7b784b5774ddfd..6245cfa067861d4d49148f936a67b9949ab93481 100644
--- a/djnro/local_settings.py.dist
+++ b/djnro/local_settings.py.dist
@@ -21,7 +21,7 @@ ALLOWED_HOSTS = []
 SECRET_KEY = '<put something really random here, eg. %$#%@#$^2312351345#$%3452345@#$%@#$234#@$hhzdavfsdcFDGVFSDGhn>'
 
 # Google Maps API key, see https://developers.google.com/maps/documentation/javascript/get-api-key#key
-GOOGLE_API_KEY = 'thisisthelongapikey'
+GOOGLE_MAPS_API_KEY = 'thisisthelongapikey'
 
 # Check for headers indicating the request was received on a secure SSL connection
 # Uncomment this if you are running DjNRO behind an HTTP proxy that sets this
diff --git a/djnro/templates/edumanage/instrealmmon_edit.html b/djnro/templates/edumanage/instrealmmon_edit.html
index a3f75b5baceb4c00b8bb64d00b3e50116be68324..19b3bdc4476e0b3d29f3a562d52545e2aaed022d 100644
--- a/djnro/templates/edumanage/instrealmmon_edit.html
+++ b/djnro/templates/edumanage/instrealmmon_edit.html
@@ -3,7 +3,7 @@
 {% load i18n %}
 
 {% block extrajs %}
-<script type="text/javascript" src="//maps.googleapis.com/maps/api/js?{% if API_KEY %}key={{ API_KEY }}{% endif %}"></script>
+<script type="text/javascript" src="//maps.googleapis.com/maps/api/js?{% if GOOGLE_MAPS_API_KEY %}key={{ GOOGLE_MAPS_API_KEY }}{% endif %}"></script>
 {% endblock %}
 
 {% block homeactive %}{% endblock %}
diff --git a/djnro/templates/edumanage/servers_edit.html b/djnro/templates/edumanage/servers_edit.html
index 73933b8f034b351956c2ba8144c7c6c4360f2c35..1bac82dbbfea12315ba11ea763620fc2bbabf2cd 100644
--- a/djnro/templates/edumanage/servers_edit.html
+++ b/djnro/templates/edumanage/servers_edit.html
@@ -137,7 +137,7 @@
 
 {% block extrajs %}
 <script type="text/javascript" src="{% static 'js/showpass.js' %}"></script>
-<script type="text/javascript" src="//maps.googleapis.com/maps/api/js?{% if API_KEY %}key={{ API_KEY }}{% endif %}"></script>
+<script type="text/javascript" src="//maps.googleapis.com/maps/api/js?{% if GOOGLE_MAPS_API_KEY %}key={{ GOOGLE_MAPS_API_KEY }}{% endif %}"></script>
 <script type="text/javascript">
 $(document).ready(function() {
 	$('#id_secret').showPassword();
diff --git a/djnro/templates/edumanage/service_details.html b/djnro/templates/edumanage/service_details.html
index 47fade0e77b2878d5cf36a87605aca0399c7b305..7acafa7ec7c1c548ed421a0b3fd170825027207d 100644
--- a/djnro/templates/edumanage/service_details.html
+++ b/djnro/templates/edumanage/service_details.html
@@ -15,7 +15,7 @@
 		width: auto !important;
 	}
 </style>
-<script type="text/javascript" src="//maps.googleapis.com/maps/api/js?{% if API_KEY %}key={{ API_KEY }}{% endif %}"></script>
+<script type="text/javascript" src="//maps.googleapis.com/maps/api/js?{% if GOOGLE_MAPS_API_KEY %}key={{ GOOGLE_MAPS_API_KEY }}{% endif %}"></script>
 <script type="text/javascript">
         var map = '';
         var lat = "{{service.latitude}}";
diff --git a/djnro/templates/edumanage/services_edit.html b/djnro/templates/edumanage/services_edit.html
index 56a338a86fc93c196767877c7beea5ff34f7ecea..2cc49a725c05bc0f948b94eb5596a790b65fb659 100644
--- a/djnro/templates/edumanage/services_edit.html
+++ b/djnro/templates/edumanage/services_edit.html
@@ -254,7 +254,7 @@
 
 {% block extrajs %}
 <script type="text/javascript" src="{% static 'js/jquery.formset.js' %}"></script>
-<script type="text/javascript" src="//maps.googleapis.com/maps/api/js?v=3.exp{% if API_KEY %}&amp;key={{ API_KEY }}{% endif %}&amp;language=en&amp;libraries=places"></script>
+<script type="text/javascript" src="//maps.googleapis.com/maps/api/js?v=3.exp{% if GOOGLE_MAPS_API_KEY %}&amp;key={{ GOOGLE_MAPS_API_KEY }}{% endif %}&amp;language=en&amp;libraries=places"></script>
 <script src="{% static 'js/jquery_csrf_protect.js' %}" type="text/javascript"></script>
 
 <script type="text/javascript">
diff --git a/djnro/templates/edumanage/welcome.html b/djnro/templates/edumanage/welcome.html
index 08fcd2bc6271c7c3b0e54041dd03579e037132d7..8683825755fbee18cfed3adf9c54215ff89ea2b9 100644
--- a/djnro/templates/edumanage/welcome.html
+++ b/djnro/templates/edumanage/welcome.html
@@ -89,6 +89,6 @@
 
 {% block extrajs %}
 <script type="text/javascript" src="{% static 'js/markerclusterer.js' %}"></script>
-<script type="text/javascript" src="//maps.googleapis.com/maps/api/js?{% if API_KEY %}key={{ API_KEY }}{% endif %}"></script>
+<script type="text/javascript" src="//maps.googleapis.com/maps/api/js?{% if GOOGLE_MAPS_API_KEY %}key={{ GOOGLE_MAPS_API_KEY }}{% endif %}"></script>
 <script type="text/javascript" src="{% static 'js/management-map.js' %}"></script>
 {% endblock %}
diff --git a/djnro/templates/front/geolocate.html b/djnro/templates/front/geolocate.html
index 5cc35bb7944b73334312cb2b5eafa69d0dc1c7e2..17d64d6083f48b3706412638fb9a57948c4aab2c 100644
--- a/djnro/templates/front/geolocate.html
+++ b/djnro/templates/front/geolocate.html
@@ -40,6 +40,6 @@
 {% endblock %}
 
 {% block extrajs %}
-<script type="text/javascript" src="//maps.google.com/maps/api/js?v=3.exp{% if API_KEY %}&amp;key={{ API_KEY }}{% endif %}&amp;language=en&amp;libraries=places"></script>
+<script type="text/javascript" src="//maps.google.com/maps/api/js?v=3.exp{% if GOOGLE_MAPS_API_KEY %}&amp;key={{ GOOGLE_MAPS_API_KEY }}{% endif %}&amp;language=en&amp;libraries=places"></script>
 <script type="text/javascript" src="{% static 'js/geolocate.js' %}"></script>
 {% endblock %}
diff --git a/djnro/templates/front/index.html b/djnro/templates/front/index.html
index cf6ac39aacb0fd630d307f484aff8bce84066ca9..f3c4ed85a2279629305b1c129581f4e007c43fc5 100644
--- a/djnro/templates/front/index.html
+++ b/djnro/templates/front/index.html
@@ -69,7 +69,7 @@
 
 {% block extrajs %}
 <script type="text/javascript" src="{% static 'js/markerclusterer.js' %}"></script>
-<script type="text/javascript" src="https://maps.googleapis.com/maps/api/js?v=3&amp;region={{COUNTRY_CODE}}{% if API_KEY %}&amp;key={{ API_KEY }}{% endif %}"></script>
+<script type="text/javascript" src="https://maps.googleapis.com/maps/api/js?v=3&amp;region={{COUNTRY_CODE}}{% if GOOGLE_MAPS_API_KEY %}&amp;key={{ GOOGLE_MAPS_API_KEY }}{% endif %}"></script>
 <script type="text/javascript" src="{% static 'js/jquery.adapt_height.js' %}"></script>
 <script type="text/javascript" src="{% static 'js/mapescape.js' %}"></script>
 <script type="text/javascript" src="{% static 'js/home-page-map.js' %}"></script>
diff --git a/djnro/templates/front/world.html b/djnro/templates/front/world.html
index 52da3c66e75e2bbbb3ca89b7c7b02014b63d1bc4..1a2e8518f861105ea17718dff130ea38302fa480 100644
--- a/djnro/templates/front/world.html
+++ b/djnro/templates/front/world.html
@@ -21,7 +21,7 @@
 
 {% block extrajs %}
 <script type="text/javascript" src="{% static 'js/markerclusterer.js' %}"></script>
-<script type="text/javascript" src="https://maps.googleapis.com/maps/api/js?v=3&amp;region={{COUNTRY_CODE}}{% if API_KEY %}&amp;key={{ API_KEY }}{% endif %}"></script>
+<script type="text/javascript" src="https://maps.googleapis.com/maps/api/js?v=3&amp;region={{COUNTRY_CODE}}{% if GOOGLE_MAPS_API_KEY %}&amp;key={{ GOOGLE_MAPS_API_KEY }}{% endif %}"></script>
 <script type="text/javascript" src="{% static 'js/jquery.adapt_height.js' %}"></script>
 <script type="text/javascript" src="{% static 'js/mapescape.js' %}"></script>
 <script type="text/javascript" src="{% static 'js/world-map.js' %}"></script>
diff --git a/edumanage/context_processors.py b/edumanage/context_processors.py
index 3e11b105bdd2adfc989086229b25a3d9e78dcae6..2c826ac703aeeb6a669e12fd90e38d7bafdf14df 100644
--- a/edumanage/context_processors.py
+++ b/edumanage/context_processors.py
@@ -12,7 +12,7 @@ def country_code(context):
         'PROV_TEAM': settings.NRO_PROV_BY_DICT,
         'SOCIAL_MEDIA_LIST': settings.NRO_PROV_SOCIAL_MEDIA_CONTACT,
         'VERSION': settings.SW_VERSION,
-        'API_KEY': settings.GOOGLE_API_KEY if hasattr(settings,"GOOGLE_API_KEY") else None,
+        'GOOGLE_MAPS_API_KEY': settings.GOOGLE_MAPS_API_KEY if hasattr(settings,"GOOGLE_MAPS_API_KEY") else None,
     }