Put back names with underscores