replace internal names with public ones