Rename the source files
To detect memory leak
Fix memory leak