diff --git a/InvenTree/InvenTree/models.py b/InvenTree/InvenTree/models.py
index be5de69be1..ca602f400c 100644
--- a/InvenTree/InvenTree/models.py
+++ b/InvenTree/InvenTree/models.py
@@ -12,7 +12,7 @@ class Company(models.Model):
         abstract = True
 
     name = models.CharField(max_length=100)
-    URL = models.URLField(blank=True)
+    website = models.URLField(blank=True)
     address = models.CharField(max_length=200,
                                blank=True)
     phone = models.CharField(max_length=50,
diff --git a/InvenTree/supplier/admin.py b/InvenTree/supplier/admin.py
index cf19edd2b0..4fe7914019 100644
--- a/InvenTree/supplier/admin.py
+++ b/InvenTree/supplier/admin.py
@@ -4,7 +4,7 @@ from .models import Supplier, SupplierPart, Customer, Manufacturer
 
 
 class CompanyAdmin(admin.ModelAdmin):
-    list_display = ('name', 'URL', 'contact')
+    list_display = ('name', 'website', 'contact')
 
 
 admin.site.register(Customer, CompanyAdmin)
diff --git a/InvenTree/supplier/serializers.py b/InvenTree/supplier/serializers.py
index 3635a93a72..9b80d33445 100644
--- a/InvenTree/supplier/serializers.py
+++ b/InvenTree/supplier/serializers.py
@@ -3,7 +3,7 @@ from rest_framework import serializers
 from .models import Supplier, SupplierPart, SupplierPriceBreak
 
 
-class SupplierSerializer(serializers.ModelSerializer):
+class SupplierSerializer(serializers.HyperlinkedModelSerializer):
 
     class Meta:
         model = Supplier
@@ -12,11 +12,13 @@ class SupplierSerializer(serializers.ModelSerializer):
 
 class SupplierPartSerializer(serializers.ModelSerializer):
 
-    price_breaks = serializers.PrimaryKeyRelatedField(many=True, read_only=True)
+    price_breaks = serializers.HyperlinkedRelatedField(many=True,
+                                                       read_only=True,
+                                                       view_name='price_break-detail')
 
     class Meta:
         model = SupplierPart
-        fields = ['pk',
+        fields = ['url',
                   'part',
                   'supplier',
                   'SKU',
@@ -32,11 +34,11 @@ class SupplierPartSerializer(serializers.ModelSerializer):
                   'lead_time']
 
 
-class SupplierPriceBreakSerializer(serializers.ModelSerializer):
+class SupplierPriceBreakSerializer(serializers.HyperlinkedModelSerializer):
 
     class Meta:
         model = SupplierPriceBreak
-        fields = ['pk',
+        fields = ['url',
                   'part',
                   'quantity',
                   'cost']
diff --git a/InvenTree/supplier/urls.py b/InvenTree/supplier/urls.py
index 10fbe8f230..28eb7c1699 100644
--- a/InvenTree/supplier/urls.py
+++ b/InvenTree/supplier/urls.py
@@ -3,15 +3,17 @@ from django.conf.urls import url, include
 from . import views
 
 partpatterns = [
-    url(r'^(?P<pk>[0-9]+)/?$', views.SupplierPartDetail.as_view()),
+    url(r'^(?P<pk>[0-9]+)/?$', views.SupplierPartDetail.as_view(), name='supplier-part-detail'),
 
-    url(r'^\?*[^/]*/?$', views.SupplierPartList.as_view())
+    url(r'^\?.*/?$', views.SupplierPartList.as_view()),
+    url(r'^$', views.SupplierPartList.as_view())
 ]
 
 pricepatterns = [
-    url(r'^(?P<pk>[0-9]+)/?$', views.SupplierPriceBreakDetail.as_view()),
+    url(r'^(?P<pk>[0-9]+)/?$', views.SupplierPriceBreakDetail.as_view(), name='price-break-detail'),
 
-    url(r'^\?*[^/]*/?$', views.SupplierPriceBreakList.as_view())
+    url(r'^\?.*/?$', views.SupplierPriceBreakList.as_view()),
+    url(r'^$', views.SupplierPriceBreakList.as_view())
 ]
 
 urlpatterns = [
@@ -23,8 +25,9 @@ urlpatterns = [
     url(r'price/?', include(pricepatterns)),
 
     # Display details of a supplier
-    url(r'^(?P<pk>[0-9]+)/?$', views.SupplierDetail.as_view()),
+    url(r'^(?P<pk>[0-9]+)/?$', views.SupplierDetail.as_view(), name='supplier-detail'),
 
     # List suppliers
-    url(r'^\?*[^/]*/?$', views.SupplierList.as_view())
+    url(r'^\?.*/?$', views.SupplierList.as_view()),
+    url(r'^$', views.SupplierList.as_view())
 ]