Changed names
New master/primary/backup architecture