Upgrading database scripts to support common names