Added Kims changes for names