diff --git a/machines/admin.py b/machines/admin.py
index e6165672..9a2d5133 100644
--- a/machines/admin.py
+++ b/machines/admin.py
@@ -38,6 +38,7 @@ from .models import (
     Nas,
     Service,
     OuverturePort,
+    Ipv6List,
     OuverturePortList
 )
 
@@ -46,6 +47,10 @@ class MachineAdmin(VersionAdmin):
     pass
 
 
+class Ipv6ListAdmin(VersionAdmin):
+    pass
+
+
 class IpTypeAdmin(VersionAdmin):
     pass
 
@@ -124,6 +129,7 @@ admin.site.register(Interface, InterfaceAdmin)
 admin.site.register(Domain, DomainAdmin)
 admin.site.register(Service, ServiceAdmin)
 admin.site.register(Vlan, VlanAdmin)
+admin.site.register(Ipv6List, Ipv6ListAdmin)
 admin.site.register(Nas, NasAdmin)
 admin.site.register(OuverturePort, OuverturePortAdmin)
 admin.site.register(OuverturePortList, OuverturePortListAdmin)
diff --git a/re2o/views.py b/re2o/views.py
index 5e6e67d1..f6d6155a 100644
--- a/re2o/views.py
+++ b/re2o/views.py
@@ -83,7 +83,7 @@ HISTORY_BIND = {
         'stack' : topologie.models.Stack,
         'model_switch' : topologie.models.ModelSwitch,
         'constructor_switch' : topologie.models.ConstructorSwitch,
-        'ap' : topologie.models.AccessPoint,
+        'accesspoint' : topologie.models.AccessPoint,
     },
     'machines' : {
         'machine' : machines.models.Machine,
@@ -99,7 +99,7 @@ HISTORY_BIND = {
         'ns' : machines.models.Ns,
         'service' : machines.models.Service,
         'vlan' : machines.models.Vlan,
-        'nas' : machines.models.Vlan,
+        'nas' : machines.models.Nas,
         'ipv6list' : machines.models.Ipv6List,
     },
 }
diff --git a/topologie/templates/topologie/aff_ap.html b/topologie/templates/topologie/aff_ap.html
index 192e5026..fc38b4b1 100644
--- a/topologie/templates/topologie/aff_ap.html
+++ b/topologie/templates/topologie/aff_ap.html
@@ -49,7 +49,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 			<td>{{ap.interface_set.first.details}}</td>
 			<td>{{ap.location}}</td>
 			<td class="text-right">
-				<a class="btn btn-info btn-sm" role="button" title="Historique" href="{% url 'topologie:history' 'ap' ap.pk %}">
+				<a class="btn btn-info btn-sm" role="button" title="Historique" href="{% url 'topologie:history' 'accesspoint' ap.pk %}">
 					<i class="fa fa-history"></i>
 				</a>
 				{% can_edit ap %}
diff --git a/topologie/urls.py b/topologie/urls.py
index 1f2968b7..90c872e6 100644
--- a/topologie/urls.py
+++ b/topologie/urls.py
@@ -37,7 +37,7 @@ urlpatterns = [
     url(r'^$', views.index, name='index'),
     url(r'^index_ap/$', views.index_ap, name='index-ap'),
     url(r'^new_ap/$', views.new_ap, name='new-ap'),
-    url(r'^edit_ap/(?P<ap_id>[0-9]+)$',
+    url(r'^edit_ap/(?P<accesspoint_id>[0-9]+)$',
         views.edit_ap,
         name='edit-ap'),
     url(r'^create_ports/(?P<switch_id>[0-9]+)$',