fix bug and rename switching