     }
 
     func removePersonFromGroup() -> ErrorType? {
-        if group == nil {
+        if addressBookGroup == nil {
             return AddressBookError.FailedToGetGroup(groupQuery)
         }
 
-        if person == nil {
+        if addressBookPerson == nil {
             return AddressBookError.FailedToGetPerson(personQuery)
         }
 
-        if let group = group, person = person, error = group.remove(person) {
+        if let group = addressBookGroup, person = addressBookPerson, error = group.remove(person) {
             return error
         }
 

                return error
            }

            self.group = group
        }
        return .None
    }

        super.init(registrar: registrar)
        if let groupName = groupName {
            groupQuery = .Name(groupName)
        }
    }

