rectify naming
change schedule on switching message sets