Change modal id naming scheme