Fixing renamed references in grammar spec