diff --git a/include/hwbinder/BufferedTextOutput.h b/include/hwbinder/BufferedTextOutput.h
index 2ae5c29..73ba6e0 100644
--- a/include/hwbinder/BufferedTextOutput.h
+++ b/include/hwbinder/BufferedTextOutput.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ANDROID_HIDL_BUFFEREDTEXTOUTPUT_H
-#define ANDROID_HIDL_BUFFEREDTEXTOUTPUT_H
+#ifndef ANDROID_HARDWARE_BUFFEREDTEXTOUTPUT_H
+#define ANDROID_HARDWARE_BUFFEREDTEXTOUTPUT_H
 
 #include <hwbinder/TextOutput.h>
 #include <utils/threads.h>
@@ -23,7 +23,7 @@
 
 // ---------------------------------------------------------------------------
 namespace android {
-namespace hidl {
+namespace hardware {
 
 class BufferedTextOutput : public TextOutput
 {
@@ -63,7 +63,7 @@
 };
 
 // ---------------------------------------------------------------------------
-}; // namespace hidl
+}; // namespace hardware
 }; // namespace android
 
-#endif // ANDROID_HIDL_BUFFEREDTEXTOUTPUT_H
+#endif // ANDROID_HARDWARE_BUFFEREDTEXTOUTPUT_H