[Update] Remove legacy underscores