fix remaining state from grand renaming