diff --git a/djangoldp_profile/migrations/0009_auto_20200625_1312.py b/djangoldp_profile/migrations/0009_auto_20200625_1312.py
new file mode 100644
index 0000000000000000000000000000000000000000..44df619fd7f2fecfe46caa31dcaf18bb2c032ca3
--- /dev/null
+++ b/djangoldp_profile/migrations/0009_auto_20200625_1312.py
@@ -0,0 +1,37 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.29 on 2020-06-25 13:12
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('djangoldp_profile', '0008_auto_20200610_1600'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='profile',
+            name='familyName',
+        ),
+        migrations.RemoveField(
+            model_name='profile',
+            name='givenName',
+        ),
+        migrations.RemoveField(
+            model_name='profile',
+            name='name',
+        ),
+        migrations.AlterField(
+            model_name='address',
+            name='is_backlink',
+            field=models.BooleanField(default=False, help_text='set automatically to indicate the Model is a backlink'),
+        ),
+        migrations.AlterField(
+            model_name='contact',
+            name='is_backlink',
+            field=models.BooleanField(default=False, help_text='set automatically to indicate the Model is a backlink'),
+        ),
+    ]
diff --git a/djangoldp_profile/models.py b/djangoldp_profile/models.py
index aa915aede0dbe4be5995477eb4418910f3e04a1e..6a14b7ca8ba356b09cbe94070b9df3b1632d0ed1 100644
--- a/djangoldp_profile/models.py
+++ b/djangoldp_profile/models.py
@@ -81,11 +81,20 @@ class Profile(Model):
     address = models.ForeignKey(Address, on_delete=models.CASCADE, related_name="profile", blank=True, null=True)
     skills = models.ManyToManyField(Skill, blank=True)
     jabberID = models.CharField(max_length=255, blank=True, null=True)
-    name = models.CharField(max_length=255, blank=True)
-    givenName = models.CharField(max_length=255, blank=True)
-    familyName = models.CharField(max_length=255, blank=True)
     phone = models.CharField(max_length=255, blank=True)
 
+    def get_full_name(self):
+        return self.givenName() + " " + self.familyName()
+
+    def name(self):
+        return self.get_full_name()
+
+    def givenName(self):
+        return self.user.first_name
+
+    def familyName(self):
+        return self.user.last_name
+
     class Meta:
         auto_author = 'user'
         anonymous_perms = ['view']
@@ -103,6 +112,7 @@ class Profile(Model):
             'name': 'foaf:name',
             'givenName': 'foaf:givenName',
             'familyName': 'foaf:familyName',
+            'picture': 'foaf:depiction',
             'bio': 'bio:biography',
             'phone': 'foaf:phone',
             'jabberID': 'foaf:jabberID',
@@ -111,9 +121,8 @@ class Profile(Model):
             'skills': 'schema:knowsAbout',
         }
 
-
     def __str__(self):
-        return '{} ({})'.format(self.user.get_full_name(), self.user.username)
+        return '{} ({})'.format(self.get_full_name(), self.username)
 
 @receiver(post_save, sender=settings.AUTH_USER_MODEL)
 def create_user_profile(sender, instance, created, **kwargs):