Use __name__ instead of func_name

Change-Id: If27e0997a1bdfe5d7fc16b77875927acd0839437
Merge "Use __name__ instead of func_name"