fix the memory leak bug and change the name