diff --git a/src/AsyncHTTPRequest_Impl_Generic.cpp b/src/AsyncHTTPRequest.cpp
similarity index 100%
rename from src/AsyncHTTPRequest_Impl_Generic.cpp
rename to src/AsyncHTTPRequest.cpp
diff --git a/src/AsyncHTTPRequest_Generic.h b/src/AsyncHTTPRequest.h
similarity index 100%
rename from src/AsyncHTTPRequest_Generic.h
rename to src/AsyncHTTPRequest.h
diff --git a/src/AsyncHTTPRequest_Debug_Generic.h b/src/AsyncHTTPRequest_Debug.h
similarity index 100%
rename from src/AsyncHTTPRequest_Debug_Generic.h
rename to src/AsyncHTTPRequest_Debug.h
diff --git a/src/utility/xbuf_Impl.cpp b/src/utility/xbuf.cpp
similarity index 100%
rename from src/utility/xbuf_Impl.cpp
rename to src/utility/xbuf.cpp