Changed names in dict, rm exit