diff --git a/topologie/admin.py b/topologie/admin.py
index f1e7fb6e..cc32c4ff 100644
--- a/topologie/admin.py
+++ b/topologie/admin.py
@@ -10,7 +10,7 @@ class PortAdmin(admin.ModelAdmin):
     list_display = ('switch', 'port','room','details')
 
 class RoomAdmin(admin.ModelAdmin):
-    list_display = ('building','room','number','details')
+    list_display = ('name',)
 
 admin.site.register(Port, PortAdmin)
 admin.site.register(Room, RoomAdmin)
diff --git a/topologie/migrations/0010_auto_20160704_2148.py b/topologie/migrations/0010_auto_20160704_2148.py
new file mode 100644
index 00000000..27917eea
--- /dev/null
+++ b/topologie/migrations/0010_auto_20160704_2148.py
@@ -0,0 +1,35 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('topologie', '0009_auto_20160703_1200'),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name='room',
+            old_name='building',
+            new_name='name',
+        ),
+        migrations.AlterUniqueTogether(
+            name='room',
+            unique_together=set([]),
+        ),
+        migrations.RemoveField(
+            model_name='room',
+            name='details',
+        ),
+        migrations.RemoveField(
+            model_name='room',
+            name='number',
+        ),
+        migrations.RemoveField(
+            model_name='room',
+            name='room',
+        ),
+    ]
diff --git a/topologie/migrations/0011_auto_20160704_2153.py b/topologie/migrations/0011_auto_20160704_2153.py
new file mode 100644
index 00000000..f14ae183
--- /dev/null
+++ b/topologie/migrations/0011_auto_20160704_2153.py
@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('topologie', '0010_auto_20160704_2148'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='room',
+            name='name',
+            field=models.CharField(max_length=255, unique=True),
+        ),
+    ]
diff --git a/topologie/models.py b/topologie/models.py
index c488d6f3..99686ca5 100644
--- a/topologie/models.py
+++ b/topologie/models.py
@@ -1,7 +1,7 @@
 from django.db import models
 from django.contrib.contenttypes.models import ContentType
 from django.contrib.contenttypes.fields import GenericForeignKey
- 
+
 
 class Switch(models.Model):
     building = models.CharField(max_length=10)
@@ -19,6 +19,7 @@ class Port(models.Model):
     port = models.IntegerField()
     details = models.CharField(max_length=255, blank=True)
     room = models.ForeignKey('Room', on_delete=models.PROTECT, blank=True, null=True)
+#    machine_interface = models.OneToOneField('machines.Interface', on_delete=models.PROTECT, blank=True, null=True)
 
     class Meta:
         unique_together = ('_content_type', '_object_id')
@@ -26,7 +27,7 @@ class Port(models.Model):
     _content_type = models.ForeignKey(ContentType, on_delete=models.CASCADE, blank=True, null=True)
     _object_id = models.PositiveIntegerField(blank=True, null=True)
     goto = GenericForeignKey('_content_type', '_object_id')
- 
+
     @property
     def comefrom(self):
         ctype = ContentType.objects.get_for_model(self.__class__)
@@ -40,14 +41,8 @@ class Port(models.Model):
         return str(self.switch) + " - " + str(self.port)
 
 class Room(models.Model):
-    details = models.CharField(max_length=255, blank=True)
-    building = models.CharField(max_length=255)
-    room = models.IntegerField()
-    number = models.IntegerField(blank=True, null=True)
-
-    class Meta:
-        unique_together = ('building', 'room', 'number')
+    name = models.CharField(max_length=255, unique=True)
 
     def __str__(self):
-        return str(self.building) + str(self.room) + '-' + str(self.number)
+        return str(self.name)