diff --git a/billard/admin.py b/billard/admin.py
index 724d3bc..110dfae 100644
--- a/billard/admin.py
+++ b/billard/admin.py
@@ -18,8 +18,8 @@ class TableAdmin(admin.ModelAdmin):
     pass
 
 
-@admin.register(TmpLocationData)
-class TmpLocationDataAdmin(admin.ModelAdmin):
+@admin.register(LocationData)
+class LocationDataAdmin(admin.ModelAdmin):
     list_display = ('location_id', 'table_no', 'tst', 'on_off',)
     fields = ['location_id', 'table_no', 'tst', 'on_off',]
     pass
diff --git a/billard/migrations/0002_tmplocationdata.py b/billard/migrations/0002_locationdata.py
similarity index 79%
rename from billard/migrations/0002_tmplocationdata.py
rename to billard/migrations/0002_locationdata.py
index 1b11981..7f3d7f1 100644
--- a/billard/migrations/0002_tmplocationdata.py
+++ b/billard/migrations/0002_locationdata.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.10.5 on 2017-01-06 18:09
+# Generated by Django 1.10.5 on 2017-01-06 19:24
 from __future__ import unicode_literals
 
 from django.db import migrations, models
@@ -13,10 +13,10 @@ class Migration(migrations.Migration):
 
     operations = [
         migrations.CreateModel(
-            name='TmpLocationData',
+            name='LocationData',
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('location_id', models.UUIDField(editable=False)),
+                ('location_id', models.CharField(max_length=32)),
                 ('table_no', models.IntegerField()),
                 ('tst', models.DateTimeField()),
                 ('on_off', models.BooleanField()),
diff --git a/billard/models.py b/billard/models.py
index 38ec358..c27ef18 100644
--- a/billard/models.py
+++ b/billard/models.py
@@ -34,8 +34,8 @@ class Table(models.Model):
         return self.name
 
 
-class TmpLocationData(models.Model):
-    location_id = models.UUIDField(blank=False, null=False)
+class LocationData(models.Model):
+    location_id = models.CharField(max_length=32, blank=False, null=False)
     table_no = models.IntegerField(blank=False, null=False)
     tst = models.DateTimeField(blank=False, null=False)
     on_off = models.BooleanField(blank=False, null=False)
diff --git a/billard/serializers.py b/billard/serializers.py
index 9fb8976..f686932 100644
--- a/billard/serializers.py
+++ b/billard/serializers.py
@@ -20,7 +20,7 @@ class TableSerializer(serializers.HyperlinkedModelSerializer):
         fields = ('client', 'number', 'name',)
 
 
-class TmpLocationDataSerializer(serializers.HyperlinkedModelSerializer):
+class LocationDataSerializer(serializers.HyperlinkedModelSerializer):
     class Meta:
-        model = TmpLocationData
+        model = LocationData
         fields = ('location_id', 'table_no', 'tst', 'on_off',)
diff --git a/billard/urls.py b/billard/urls.py
index 16419fe..0c64b02 100644
--- a/billard/urls.py
+++ b/billard/urls.py
@@ -6,8 +6,8 @@ router = routers.DefaultRouter()
 router.register(r'clients', views.ClientViewSet)
 router.register(r'locations', views.LocationViewSet)
 router.register(r'tables', views.TableViewSet)
-router.register(r'location_data', views.TmpLocationDataViewSet)
+router.register(r'location_data', views.LocationDataViewSet)
 
 urlpatterns = [
     url(r'api/v1/', include(router.urls)),
-    ]
\ No newline at end of file
+]
diff --git a/billard/views.py b/billard/views.py
index 3696dfd..c7d7e27 100644
--- a/billard/views.py
+++ b/billard/views.py
@@ -17,6 +17,6 @@ class TableViewSet(viewsets.ModelViewSet):
     serializer_class = TableSerializer
 
 
-class TmpLocationDataViewSet(viewsets.ModelViewSet):
-    queryset = TmpLocationData.objects.all()
-    serializer_class = TmpLocationDataSerializer
+class LocationDataViewSet(viewsets.ModelViewSet):
+    queryset = LocationData.objects.all()
+    serializer_class = LocationDataSerializer