shifts fixed, naming scheme readjusted