Revert "Revert "Revert "nfc: reflect style guide."""

This reverts commit 106bc9d27a271b316ce3b4237d59a908c23a4ec0.

Change-Id: Ie2e0ad4aeaa58c45bab05234615bd7fa02b84c1a
diff --git a/nfc/1.0/INfcClientCallback.hal b/nfc/1.0/INfcClientCallback.hal
index a56cc09..f10062e 100644
--- a/nfc/1.0/INfcClientCallback.hal
+++ b/nfc/1.0/INfcClientCallback.hal
@@ -21,11 +21,11 @@
      * The callback passed in from the NFC stack that the HAL
      * can use to pass events back to the stack.
      */
-    sendEvent(NfcEvent event, NfcStatus status);
+    sendEvent(nfc_event_t event, nfc_status_t event_status);
 
     /*
      * The callback passed in from the NFC stack that the HAL
      * can use to pass incomming data to the stack.
      */
-    sendData(NfcData data);
+    sendData(nfc_data_t data);
 };