7 files changed, 24 insertions, 24 deletions

diff --git a/src/datacache/Makefile.am b/src/datacache/Makefile.am
index c650521d6..5e01fe03e 100644
--- a/src/datacache/Makefile.am
+++ b/src/datacache/Makefile.am
@@ -16,7 +16,7 @@ lib_LTLIBRARIES = \
   libgnunetdatacache.la
 
 libgnunetdatacache_la_SOURCES = \
-  datacache_api.c plugin_datacache.h
+  datacache.c plugin_datacache.h
 libgnunetdatacache_la_LIBADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(GN_LIBINTL) 
@@ -47,30 +47,30 @@ libgnunet_plugin_datacache_template_la_LDFLAGS = \
 
 
 check_PROGRAMS = \
- test_datacache_api \
- test_datacache_api_quota \
- perf_datacache_api 
+ test_datacache \
+ test_datacache_quota \
+ perf_datacache 
 
 TESTS = $(check_PROGRAMS)
 
-test_datacache_api_SOURCES = \
- test_datacache_api.c
-test_datacache_api_LDADD = \
+test_datacache_SOURCES = \
+ test_datacache.c
+test_datacache_LDADD = \
  $(top_builddir)/src/datacache/libgnunetdatacache.la \
  $(top_builddir)/src/util/libgnunetutil.la  
 
-test_datacache_api_quota_SOURCES = \
- test_datacache_api_quota.c
-test_datacache_api_quota_LDADD = \
+test_datacache_quota_SOURCES = \
+ test_datacache_quota.c
+test_datacache_quota_LDADD = \
  $(top_builddir)/src/datacache/libgnunetdatacache.la \
  $(top_builddir)/src/util/libgnunetutil.la  
 
-perf_datacache_api_SOURCES = \
- perf_datacache_api.c
-perf_datacache_api_LDADD = \
+perf_datacache_SOURCES = \
+ perf_datacache.c
+perf_datacache_LDADD = \
  $(top_builddir)/src/datacache/libgnunetdatacache.la \
  $(top_builddir)/src/util/libgnunetutil.la  
 
 EXTRA_DIST = \
- test_datacache_api_data.conf \
- perf_datacache_api_data.conf
+ test_datacache_data.conf \
+ perf_datacache_data.conf
diff --git a/src/datacache/datacache_api.c b/src/datacache/datacache.c
index 421acac0f..421acac0f 100644
--- a/src/datacache/datacache_api.c
+++ b/src/datacache/datacache.c
diff --git a/src/datacache/perf_datacache_api.c b/src/datacache/perf_datacache.c
index aa11fe122..818b6f816 100644
--- a/src/datacache/perf_datacache_api.c
+++ b/src/datacache/perf_datacache.c
@@ -18,7 +18,7 @@
      Boston, MA 02111-1307, USA.
 */
 /*
- * @file datacache/perf_datacache_api.c
+ * @file datacache/perf_datacache.c
  * @brief Performance evaluation for the datacache implementations.
  * @author Nils Durner
  */
@@ -124,7 +124,7 @@ check ()
 {
   char *const argv[] = { "perf-datacache-api",
     "-c",
-    "perf_datacache_api_data.conf",
+    "perf_datacache_data.conf",
 #if VERBOSE
     "-L", "DEBUG",
 #endif
@@ -160,4 +160,4 @@ main (int argc, char *argv[])
   return ret;
 }
 
-/* end of perf_datacache_api.c */
+/* end of perf_datacache.c */
diff --git a/src/datacache/perf_datacache_api_data.conf b/src/datacache/perf_datacache_data.conf
index 55e178d99..55e178d99 100644
--- a/src/datacache/perf_datacache_api_data.conf
+++ b/src/datacache/perf_datacache_data.conf
diff --git a/src/datacache/test_datacache_api.c b/src/datacache/test_datacache.c
index 8a5a356d2..c896b667b 100644
--- a/src/datacache/test_datacache_api.c
+++ b/src/datacache/test_datacache.c
@@ -18,7 +18,7 @@
      Boston, MA 02111-1307, USA.
 */
 /*
- * @file datacache/test_datacache_api.c
+ * @file datacache/test_datacache.c
  * @brief Test for the datacache implementations.
  * @author Nils Durner
  */
@@ -112,7 +112,7 @@ check ()
 {
   char *const argv[] = { "test-datacache-api",
     "-c",
-    "test_datacache_api_data.conf",
+    "test_datacache_data.conf",
 #if VERBOSE
     "-L", "DEBUG",
 #endif
@@ -147,4 +147,4 @@ main (int argc, char *argv[])
   return ret;
 }
 
-/* end of test_datacache_api.c */
+/* end of test_datacache.c */
diff --git a/src/datacache/test_datacache_api_data.conf b/src/datacache/test_datacache_data.conf
index 2e8606682..2e8606682 100644
--- a/src/datacache/test_datacache_api_data.conf
+++ b/src/datacache/test_datacache_data.conf
diff --git a/src/datacache/test_datacache_api_quota.c b/src/datacache/test_datacache_quota.c
index c912c4927..1cad2a907 100644
--- a/src/datacache/test_datacache_api_quota.c
+++ b/src/datacache/test_datacache_quota.c
@@ -18,7 +18,7 @@
      Boston, MA 02111-1307, USA.
 */
 /*
- * @file datacache/test_datacache_api_quota.c
+ * @file datacache/test_datacache_quota.c
  * @brief Test for the quota code of the datacache implementations.
  * @author Nils Durner
  */
@@ -114,7 +114,7 @@ check ()
 {
   char *const argv[] = { "test-datacache-api-quota",
     "-c",
-    "test_datacache_api_data.conf",
+    "test_datacache_data.conf",
 #if VERBOSE
     "-L", "DEBUG",
 #endif
@@ -149,4 +149,4 @@ main (int argc, char *argv[])
   return ret;
 }
 
-/* end of test_datacache_api_quota.c */
+/* end of test_datacache_quota.c */