fix entry names