[Minor] Cleanup the workspace and adjust the file name.