Keep old name to get comments back.