diff --git a/Time.cpp b/ArduinoTime.cpp
similarity index 99%
rename from Time.cpp
rename to ArduinoTime.cpp
index f79754c..490be1a 100644
--- a/Time.cpp
+++ b/ArduinoTime.cpp
@@ -1,5 +1,5 @@
 /*
-  time.c - low level time and date functions
+  ArduinoTime.cpp - low level time and date functions
   Copyright (c) Michael Margolis 2009-2014
 
   This library is free software; you can redistribute it and/or
@@ -33,7 +33,7 @@
 //#include <WProgram.h>
 //#endif
 
-#include "TimeLib.h"
+#include "ArduinoTimeLib.h"
 
 #include <esp_timer.h>
 
diff --git a/ArduinoTime.h b/ArduinoTime.h
new file mode 100644
index 0000000..a61d10d
--- /dev/null
+++ b/ArduinoTime.h
@@ -0,0 +1,2 @@
+#warning "Please include ArduinoTimeLib.h, not ArduinoTime.h.  Future versions will remove ArduinoTime.h"
+#include "ArduinoTimeLib.h"
diff --git a/TimeLib.h b/ArduinoTimeLib.h
similarity index 98%
rename from TimeLib.h
rename to ArduinoTimeLib.h
index 0fd5f6c..24a7b43 100644
--- a/TimeLib.h
+++ b/ArduinoTimeLib.h
@@ -1,15 +1,14 @@
 /*
-  time.h - low level time and date functions
+  ArduinoTimeLib.h - low level time and date functions
 */
 
 /*
   July 3 2011 - fixed elapsedSecsThisWeek macro (thanks Vincent Valdy for this)
               - fixed  daysToTime_t macro (thanks maniacbug)
-*/     
+*/
 
-#ifndef _Time_h
+#pragma once
 #ifdef __cplusplus
-#define _Time_h
 
 #include <inttypes.h>
 #ifndef __AVR__
@@ -140,5 +139,4 @@ time_t makeTime(const tmElements_t &tm);  // convert time elements into time_t
 
 } // extern "C++"
 #endif // __cplusplus
-#endif /* _Time_h */
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index bdd8203..433ba05 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,11 +1,11 @@
 set(headers
-    Time.h
-    TimeLib.h
+    ArduinoTime.h
+    ArduinoTimeLib.h
 )
 
 set(sources
+    ArduinoTime.cpp
     DateStrings.cpp
-    Time.cpp
 )
 
 set(dependencies
@@ -23,8 +23,6 @@ idf_component_register(
 )
 
 target_compile_options(${COMPONENT_TARGET}
-    PUBLIC
-        -DUSE_FACADE=true
     PRIVATE
         -fstack-reuse=all
         -fstack-protector-all
diff --git a/DateStrings.cpp b/DateStrings.cpp
index 1fa77fe..26bd9c8 100644
--- a/DateStrings.cpp
+++ b/DateStrings.cpp
@@ -11,7 +11,7 @@
 
 //#include <Arduino.h>
 
-#include "TimeLib.h"
+#include "ArduinoTimeLib.h"
 
  
 // the short strings for each day or month must be exactly dt_SHORT_STR_LEN
diff --git a/Time.h b/Time.h
deleted file mode 100644
index 6fa02fa..0000000
--- a/Time.h
+++ /dev/null
@@ -1,2 +0,0 @@
-#warning "Please include TimeLib.h, not Time.h.  Future versions will remove Time.h"
-#include "TimeLib.h"