Merge "Use clear names for native API"