Merge "Modify variable names and parameter clearly" into tizen