fix two bugs in servant name generation