@@ -11,11 +11,11 @@
 STATIC_LIB_NOINST = ${TESTS_STATIC_LIB}
 SRCS = ForwardingTests.m		\
        OFASN1DERRepresentationTests.m	\
        OFASN1DERValueTests.m		\
        OFArrayTests.m			\
-       ${OFBLOCKTESTS_M}		\
+       ${OF_BLOCK_TESTS_M}		\
        OFCharacterSetTests.m		\
        OFDataTests.m			\
        OFDateTests.m			\
        OFDictionaryTests.m		\
        OFInvocationTests.m		\
@@ -54,16 +54,16 @@
 	     OFSHA256HashTests.m	\
 	     OFSHA384HashTests.m	\
 	     OFSHA512HashTests.m
 SRCS_PLUGINS = OFPluginTests.m
 SRCS_SOCKETS = OFDNSResolverTests.m		\
-	       ${OFHTTPCLIENTTESTS_M}		\
+	       ${OF_HTTP_CLIENT_TESTS_M}	\
 	       OFHTTPCookieTests.m		\
 	       OFHTTPCookieManagerTests.m	\
-	       ${OFIPXSOCKETTESTS_M}		\
+	       ${OF_IPX_SOCKET_TESTS_M}		\
 	       OFKernelEventObserverTests.m	\
-	       ${OFSPXSOCKETTESTS_M}		\
+	       ${OF_SPX_SOCKET_TESTS_M}		\
 	       OFTCPSocketTests.m		\
 	       OFUDPSocketTests.m		\
 	       SocketTests.m
 SRCS_THREADS = OFThreadTests.m
 SRCS_WINDOWS = OFWindowsRegistryKeyTests.m