Adjust 2.3.7 upgrade process for 2.4.0 table rename