diff --git a/docs/README b/docs/README
index 52a55d5..71ff35d 100644
--- a/docs/README
+++ b/docs/README
@@ -109,6 +109,7 @@ Features:
 * RFC 6156 - TURN Extension for IPv6
 * Symmetric RTP
 * ITU-T G.711 Appendix I and Appendix II
+* draft-ietf-bfcpbis-rfc4582bis-08
 
 
 Supported platforms:
diff --git a/mk/symbian/rebfcp.mmp b/mk/symbian/rebfcp.mmp
index d5d9a26..f485cea 100644
--- a/mk/symbian/rebfcp.mmp
+++ b/mk/symbian/rebfcp.mmp
@@ -24,12 +24,10 @@ SOURCE        dll.cpp
 
 SOURCEPATH    ..\..\src\bfcp
 SOURCE        attr.c
-SOURCE        hdr.c
+SOURCE        conn.c
 SOURCE        msg.c
-SOURCE        rep.c
-SOURCE        req.c
-SOURCE        sock.c
-SOURCE        transp.c
+SOURCE        reply.c
+SOURCE        request.c
 
 USERINCLUDE   . ..\..\include
 SYSTEMINCLUDE \epoc32\include
diff --git a/mk/win32/re.vcproj b/mk/win32/re.vcproj
index c9b4acf..461a7ed 100644
--- a/mk/win32/re.vcproj
+++ b/mk/win32/re.vcproj
@@ -115,22 +115,16 @@
 					RelativePath="..\..\src\bfcp\attr.c">
 				</File>
 				<File
-					RelativePath="..\..\src\bfcp\hdr.c">
+					RelativePath="..\..\src\bfcp\conn.c">
 				</File>
 				<File
 					RelativePath="..\..\src\bfcp\msg.c">
 				</File>
 				<File
-					RelativePath="..\..\src\bfcp\rep.c">
+					RelativePath="..\..\src\bfcp\reply.c">
 				</File>
 				<File
-					RelativePath="..\..\src\bfcp\req.c">
-				</File>
-				<File
-					RelativePath="..\..\src\bfcp\sock.c">
-				</File>
-				<File
-					RelativePath="..\..\src\bfcp\transp.c">
+					RelativePath="..\..\src\bfcp\request.c">
 				</File>
 			</Filter>
 			<Filter