Merge "Adjust naming convention to API." into tizen