diff --git a/gramps2/src/EditPerson.py b/gramps2/src/EditPerson.py
index 70ffe0bde..392e6157a 100644
--- a/gramps2/src/EditPerson.py
+++ b/gramps2/src/EditPerson.py
@@ -355,7 +355,7 @@ class EditPerson:
             "on_add_aka_clicked"        : self.on_add_aka_clicked,
             "on_add_attr_clicked"       : self.on_add_attr_clicked,
             "on_add_url_clicked"        : self.on_add_url_clicked,
-            "on_addphoto_clicked"       : self.gallery.on_add_media_object_clicked,
+            "on_addphoto_clicked"       : self.gallery.on_add_photo_clicked,
             "on_selectphoto_clicked"    : self.gallery.on_select_photo_clicked,
             "on_aka_delete_clicked"     : self.on_aka_delete_clicked,
             "on_aka_update_clicked"     : self.on_aka_update_clicked,
diff --git a/gramps2/src/GrampsParser.py b/gramps2/src/GrampsParser.py
index c1eef0b59..514875179 100644
--- a/gramps2/src/GrampsParser.py
+++ b/gramps2/src/GrampsParser.py
@@ -1,7 +1,7 @@
 #
 # Gramps - a GTK+/GNOME based genealogy program
 #
-# Copyright (C) 2000-2003  Donald N. Allingham
+# Copyright (C) 2000-2004  Donald N. Allingham
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -423,7 +423,7 @@ class GrampsParser:
 
     def start_last(self,attrs):
         if attrs.has_key('prefix'):
-            self.name.set_prefix(attrs['prefix'])
+            self.name.set_surname_prefix(attrs['prefix'])
         
     def start_note(self,attrs):
         self.in_note = 1