-more uniform naming of statisitcs

15 files changed, 46 insertions, 46 deletions

diff --git a/bin/rename.sh b/bin/rename.sh
index 7d5790b419..178b44081f 100755
--- a/bin/rename.sh
+++ b/bin/rename.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-for n in `find * -name "*.c"` `find * -name "*.h"`
+for n in `find * -name "*.c"` `find * -name "*.h"` `find * -name "*.in"`
 do
  cat $n | sed -e "s/$1/$2/g" > $n.new
  mv $n.new $n || echo "Move failed: $n.new to $n"
diff --git a/src/dht/test_dht_multipeer.c b/src/dht/test_dht_multipeer.c
index 9649405b17..2be938c965 100644
--- a/src/dht/test_dht_multipeer.c
+++ b/src/dht/test_dht_multipeer.c
@@ -276,7 +276,7 @@ static struct StatValues stats[] = {
   {"core", "# bytes encrypted", 0},
   {"core", "# type maps received", 0},
   {"core", "# session keys confirmed via PONG", 0},
-  {"core", "# entries in session map", 0},
+  {"core", "# peers connected", 0},
   {"core", "# key exchanges initiated", 0},
   {"core", "# send requests dropped (disconnected)", 0},
   {"core", "# transmissions delayed due to corking", 0},
diff --git a/src/integration-tests/connection_watchdog.c b/src/integration-tests/connection_watchdog.c
index 709ca4eebd..5929476948 100644
--- a/src/integration-tests/connection_watchdog.c
+++ b/src/integration-tests/connection_watchdog.c
@@ -499,7 +499,7 @@ stats_check (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 
   GNUNET_STATISTICS_get (stats, "transport", "# peers connected", GNUNET_TIME_UNIT_MINUTES, NULL, &stats_check_cb, &statistics_transport_connections);
   GNUNET_STATISTICS_get (stats, "core", "# neighbour entries allocated", GNUNET_TIME_UNIT_MINUTES, NULL, &stats_check_cb, &statistics_core_neighbour_entries);
-  GNUNET_STATISTICS_get (stats, "core", "# entries in session map", GNUNET_TIME_UNIT_MINUTES, NULL, &stats_check_cb, &statistics_core_entries_session_map);
+  GNUNET_STATISTICS_get (stats, "core", "# peers connected", GNUNET_TIME_UNIT_MINUTES, NULL, &stats_check_cb, &statistics_core_entries_session_map);
 
   /* TCP plugin specific checks */
   if (GNUNET_YES == have_tcp)
diff --git a/src/integration-tests/test_integration_bootstrap_and_connect.py.in b/src/integration-tests/test_integration_bootstrap_and_connect.py.in
index b1743774ed..1e71488dc2 100755
--- a/src/integration-tests/test_integration_bootstrap_and_connect.py.in
+++ b/src/integration-tests/test_integration_bootstrap_and_connect.py.in
@@ -74,14 +74,14 @@ def check ():
   check = Check (test)
   check.add (StatisticsCondition (client, 'transport', '# peers connected',1))
   check.add (StatisticsCondition (client, 'core', '# neighbour entries allocated',1))  
-  check.add (StatisticsCondition (client, 'core', '# entries in session map',1))
+  check.add (StatisticsCondition (client, 'core', '# peers connected',1))
   check.add (StatisticsCondition (client, 'topology', '# peers connected',1))
   check.add (StatisticsCondition (client, 'fs', '# peers connected',1))
   
 
   check.add (StatisticsCondition (server, 'transport', '# peers connected',1))
   check.add (StatisticsCondition (server, 'core', '# neighbour entries allocated',1))  
-  check.add (StatisticsCondition (server, 'core', '# entries in session map',1))
+  check.add (StatisticsCondition (server, 'core', '# peers connected',1))
   check.add (StatisticsCondition (server, 'topology', '# peers connected',1))
   check.add (StatisticsCondition (server, 'fs', '# peers connected',1))  
   
diff --git a/src/integration-tests/test_integration_bootstrap_and_connect_and_disconnect.py.in b/src/integration-tests/test_integration_bootstrap_and_connect_and_disconnect.py.in
index 0346fd66c9..aefb9cd8fb 100755
--- a/src/integration-tests/test_integration_bootstrap_and_connect_and_disconnect.py.in
+++ b/src/integration-tests/test_integration_bootstrap_and_connect_and_disconnect.py.in
@@ -71,7 +71,7 @@ def success_cont (check):
 	check = Check (test)
   	check.add (StatisticsCondition (client, 'transport', '# peers connected',0))
   	check.add (StatisticsCondition (client, 'core', '# neighbour entries allocated',0))  
-  	check.add (StatisticsCondition (client, 'core', '# entries in session map',0))
+  	check.add (StatisticsCondition (client, 'core', '# peers connected',0))
   	check.add (StatisticsCondition (client, 'topology', '# peers connected',0))
   	check.add (StatisticsCondition (client, 'fs', '# peers connected',0))
 	
@@ -86,14 +86,14 @@ def check ():
   check = Check (test)
   check.add (StatisticsCondition (client, 'transport', '# peers connected',1))
   check.add (StatisticsCondition (client, 'core', '# neighbour entries allocated',1))  
-  check.add (StatisticsCondition (client, 'core', '# entries in session map',1))
+  check.add (StatisticsCondition (client, 'core', '# peers connected',1))
   check.add (StatisticsCondition (client, 'topology', '# peers connected',1))
   check.add (StatisticsCondition (client, 'fs', '# peers connected',1))
   
 
   check.add (StatisticsCondition (server, 'transport', '# peers connected',1))
   check.add (StatisticsCondition (server, 'core', '# neighbour entries allocated',1))  
-  check.add (StatisticsCondition (server, 'core', '# entries in session map',1))
+  check.add (StatisticsCondition (server, 'core', '# peers connected',1))
   check.add (StatisticsCondition (server, 'topology', '# peers connected',1))
   check.add (StatisticsCondition (server, 'fs', '# peers connected',1))  
   
diff --git a/src/integration-tests/test_integration_bootstrap_and_connect_and_disconnect_nat.py.in b/src/integration-tests/test_integration_bootstrap_and_connect_and_disconnect_nat.py.in
index 6b720cbb12..88327bfa16 100755
--- a/src/integration-tests/test_integration_bootstrap_and_connect_and_disconnect_nat.py.in
+++ b/src/integration-tests/test_integration_bootstrap_and_connect_and_disconnect_nat.py.in
@@ -71,7 +71,7 @@ def success_cont (check):
 	check = Check (test)
   	check.add (StatisticsCondition (client, 'transport', '# peers connected',0))
   	check.add (StatisticsCondition (client, 'core', '# neighbour entries allocated',0))  
-  	check.add (StatisticsCondition (client, 'core', '# entries in session map',0))
+  	check.add (StatisticsCondition (client, 'core', '# peers connected',0))
   	check.add (StatisticsCondition (client, 'topology', '# peers connected',0))
   	check.add (StatisticsCondition (client, 'fs', '# peers connected',0))
 	
@@ -86,14 +86,14 @@ def check ():
   check = Check (test)
   check.add (StatisticsCondition (client, 'transport', '# peers connected',1))
   check.add (StatisticsCondition (client, 'core', '# neighbour entries allocated',1))  
-  check.add (StatisticsCondition (client, 'core', '# entries in session map',1))
+  check.add (StatisticsCondition (client, 'core', '# peers connected',1))
   check.add (StatisticsCondition (client, 'topology', '# peers connected',1))
   check.add (StatisticsCondition (client, 'fs', '# peers connected',1))
   
 
   check.add (StatisticsCondition (server, 'transport', '# peers connected',1))
   check.add (StatisticsCondition (server, 'core', '# neighbour entries allocated',1))  
-  check.add (StatisticsCondition (server, 'core', '# entries in session map',1))
+  check.add (StatisticsCondition (server, 'core', '# peers connected',1))
   check.add (StatisticsCondition (server, 'topology', '# peers connected',1))
   check.add (StatisticsCondition (server, 'fs', '# peers connected',1))  
   
diff --git a/src/integration-tests/test_integration_clique.py.in b/src/integration-tests/test_integration_clique.py.in
index 82a406d0b7..65c9341212 100755
--- a/src/integration-tests/test_integration_clique.py.in
+++ b/src/integration-tests/test_integration_clique.py.in
@@ -73,7 +73,7 @@ def check_disconnect_client ():
   
   check.add (StatisticsCondition (client2, 'transport', '# peers connected',0))
   check.add (StatisticsCondition (client2, 'core', '# neighbour entries allocated',0))  
-  check.add (StatisticsCondition (client2, 'core', '# entries in session map',0))
+  check.add (StatisticsCondition (client2, 'core', '# peers connected',0))
   check.add (StatisticsCondition (client2, 'topology', '# peers connected',0))
   check.add (StatisticsCondition (client2, 'fs', '# peers connected',0))
   
@@ -96,13 +96,13 @@ def check_disconnect_server ():
   check = Check (test)
   check.add (StatisticsCondition (client, 'transport', '# peers connected',1))
   check.add (StatisticsCondition (client, 'core', '# neighbour entries allocated',1))  
-  check.add (StatisticsCondition (client, 'core', '# entries in session map',1))
+  check.add (StatisticsCondition (client, 'core', '# peers connected',1))
   check.add (StatisticsCondition (client, 'topology', '# peers connected',1))
   check.add (StatisticsCondition (client, 'fs', '# peers connected',1))
   
   check.add (StatisticsCondition (client2, 'transport', '# peers connected',1))
   check.add (StatisticsCondition (client2, 'core', '# neighbour entries allocated',1))  
-  check.add (StatisticsCondition (client2, 'core', '# entries in session map',1))
+  check.add (StatisticsCondition (client2, 'core', '# peers connected',1))
   check.add (StatisticsCondition (client2, 'topology', '# peers connected',1))
   check.add (StatisticsCondition (client2, 'fs', '# peers connected',1))
   
@@ -123,19 +123,19 @@ def check_connect ():
   check = Check (test)
   check.add (StatisticsCondition (client, 'transport', '# peers connected',2))
   check.add (StatisticsCondition (client, 'core', '# neighbour entries allocated',2))  
-  check.add (StatisticsCondition (client, 'core', '# entries in session map',2))
+  check.add (StatisticsCondition (client, 'core', '# peers connected',2))
   check.add (StatisticsCondition (client, 'topology', '# peers connected',2))
   check.add (StatisticsCondition (client, 'fs', '# peers connected',2))
 
   check.add (StatisticsCondition (client2, 'transport', '# peers connected',2))
   check.add (StatisticsCondition (client2, 'core', '# neighbour entries allocated',2))  
-  check.add (StatisticsCondition (client2, 'core', '# entries in session map',2))
+  check.add (StatisticsCondition (client2, 'core', '# peers connected',2))
   check.add (StatisticsCondition (client2, 'topology', '# peers connected',2))
   check.add (StatisticsCondition (client2, 'fs', '# peers connected',2))
   
   check.add (StatisticsCondition (server, 'transport', '# peers connected',2))
   check.add (StatisticsCondition (server, 'core', '# neighbour entries allocated',2))  
-  check.add (StatisticsCondition (server, 'core', '# entries in session map',2))
+  check.add (StatisticsCondition (server, 'core', '# peers connected',2))
   check.add (StatisticsCondition (server, 'topology', '# peers connected',2))
   check.add (StatisticsCondition (server, 'fs', '# peers connected',2))  
   
diff --git a/src/integration-tests/test_integration_clique_nat.py.in b/src/integration-tests/test_integration_clique_nat.py.in
index 82d85f5309..59d117949d 100755
--- a/src/integration-tests/test_integration_clique_nat.py.in
+++ b/src/integration-tests/test_integration_clique_nat.py.in
@@ -73,7 +73,7 @@ def check_disconnect_client ():
   
   check.add (StatisticsCondition (client2, 'transport', '# peers connected',0))
   check.add (StatisticsCondition (client2, 'core', '# neighbour entries allocated',0))  
-  check.add (StatisticsCondition (client2, 'core', '# entries in session map',0))
+  check.add (StatisticsCondition (client2, 'core', '# peers connected',0))
   check.add (StatisticsCondition (client2, 'topology', '# peers connected',0))
   check.add (StatisticsCondition (client2, 'fs', '# peers connected',0))
   
@@ -96,13 +96,13 @@ def check_disconnect_server ():
   check = Check (test)
   check.add (StatisticsCondition (client, 'transport', '# peers connected',1))
   check.add (StatisticsCondition (client, 'core', '# neighbour entries allocated',1))  
-  check.add (StatisticsCondition (client, 'core', '# entries in session map',1))
+  check.add (StatisticsCondition (client, 'core', '# peers connected',1))
   check.add (StatisticsCondition (client, 'topology', '# peers connected',1))
   check.add (StatisticsCondition (client, 'fs', '# peers connected',1))
   
   check.add (StatisticsCondition (client2, 'transport', '# peers connected',1))
   check.add (StatisticsCondition (client2, 'core', '# neighbour entries allocated',1))  
-  check.add (StatisticsCondition (client2, 'core', '# entries in session map',1))
+  check.add (StatisticsCondition (client2, 'core', '# peers connected',1))
   check.add (StatisticsCondition (client2, 'topology', '# peers connected',1))
   check.add (StatisticsCondition (client2, 'fs', '# peers connected',1))
   
@@ -123,19 +123,19 @@ def check_connect ():
   check = Check (test)
   check.add (StatisticsCondition (client, 'transport', '# peers connected',2))
   check.add (StatisticsCondition (client, 'core', '# neighbour entries allocated',2))  
-  check.add (StatisticsCondition (client, 'core', '# entries in session map',2))
+  check.add (StatisticsCondition (client, 'core', '# peers connected',2))
   check.add (StatisticsCondition (client, 'topology', '# peers connected',2))
   check.add (StatisticsCondition (client, 'fs', '# peers connected',2))
 
   check.add (StatisticsCondition (client2, 'transport', '# peers connected',2))
   check.add (StatisticsCondition (client2, 'core', '# neighbour entries allocated',2))  
-  check.add (StatisticsCondition (client2, 'core', '# entries in session map',2))
+  check.add (StatisticsCondition (client2, 'core', '# peers connected',2))
   check.add (StatisticsCondition (client2, 'topology', '# peers connected',2))
   check.add (StatisticsCondition (client2, 'fs', '# peers connected',2))
   
   check.add (StatisticsCondition (server, 'transport', '# peers connected',2))
   check.add (StatisticsCondition (server, 'core', '# neighbour entries allocated',2))  
-  check.add (StatisticsCondition (server, 'core', '# entries in session map',2))
+  check.add (StatisticsCondition (server, 'core', '# peers connected',2))
   check.add (StatisticsCondition (server, 'topology', '# peers connected',2))
   check.add (StatisticsCondition (server, 'fs', '# peers connected',2))  
   
diff --git a/src/integration-tests/test_integration_connect_on_restart.py.in b/src/integration-tests/test_integration_connect_on_restart.py.in
index 536ffd8868..f77fd1c320 100755
--- a/src/integration-tests/test_integration_connect_on_restart.py.in
+++ b/src/integration-tests/test_integration_connect_on_restart.py.in
@@ -82,13 +82,13 @@ def success_connect_cont (check):
 	check = Check (test)
 	check.add (StatisticsCondition (client, 'transport', '# peers connected',1))
 	check.add (StatisticsCondition (client, 'core', '# neighbour entries allocated',1))  
-	check.add (StatisticsCondition (client, 'core', '# entries in session map',1))
+	check.add (StatisticsCondition (client, 'core', '# peers connected',1))
 	check.add (StatisticsCondition (client, 'topology', '# peers connected',1))
 	check.add (StatisticsCondition (client, 'fs', '# peers connected',1))
 	
 	check.add (StatisticsCondition (client2, 'transport', '# peers connected',1))
 	check.add (StatisticsCondition (client2, 'core', '# neighbour entries allocated',1))  
-	check.add (StatisticsCondition (client2, 'core', '# entries in session map',1))
+	check.add (StatisticsCondition (client2, 'core', '# peers connected',1))
 	check.add (StatisticsCondition (client2, 'topology', '# peers connected',1))
 	check.add (StatisticsCondition (client2, 'fs', '# peers connected',1))  
 
@@ -106,19 +106,19 @@ def check_connect ():
   check = Check (test)
   check.add (StatisticsCondition (client, 'transport', '# peers connected',2))
   check.add (StatisticsCondition (client, 'core', '# neighbour entries allocated',2))  
-  check.add (StatisticsCondition (client, 'core', '# entries in session map',2))
+  check.add (StatisticsCondition (client, 'core', '# peers connected',2))
   check.add (StatisticsCondition (client, 'topology', '# peers connected',2))
   check.add (StatisticsCondition (client, 'fs', '# peers connected',2))
 
   check.add (StatisticsCondition (client2, 'transport', '# peers connected',2))
   check.add (StatisticsCondition (client2, 'core', '# neighbour entries allocated',2))  
-  check.add (StatisticsCondition (client2, 'core', '# entries in session map',2))
+  check.add (StatisticsCondition (client2, 'core', '# peers connected',2))
   check.add (StatisticsCondition (client2, 'topology', '# peers connected',2))
   check.add (StatisticsCondition (client2, 'fs', '# peers connected',2))
   
   check.add (StatisticsCondition (server, 'transport', '# peers connected',2))
   check.add (StatisticsCondition (server, 'core', '# neighbour entries allocated',2))  
-  check.add (StatisticsCondition (server, 'core', '# entries in session map',2))
+  check.add (StatisticsCondition (server, 'core', '# peers connected',2))
   check.add (StatisticsCondition (server, 'topology', '# peers connected',2))
   check.add (StatisticsCondition (server, 'fs', '# peers connected',2))  
   
diff --git a/src/integration-tests/test_integration_connection_values_tcp.py.in b/src/integration-tests/test_integration_connection_values_tcp.py.in
index 7b71abcd1a..d8a92bad4a 100755
--- a/src/integration-tests/test_integration_connection_values_tcp.py.in
+++ b/src/integration-tests/test_integration_connection_values_tcp.py.in
@@ -65,10 +65,10 @@ def fail_cont (check):
 def check_connect ():
   check = Check (test)
   check.add (EqualStatisticsCondition (client, 'transport', '# peers connected', client,  'core', '# neighbour entries allocated'))
-  check.add (EqualStatisticsCondition (client, 'transport', '# peers connected', client,  'core', '# entries in session map'))
-  check.add (EqualStatisticsCondition (client, 'core', '# neighbour entries allocated', client,  'core', '# entries in session map'))
+  check.add (EqualStatisticsCondition (client, 'transport', '# peers connected', client,  'core', '# peers connected'))
+  check.add (EqualStatisticsCondition (client, 'core', '# neighbour entries allocated', client,  'core', '# peers connected'))
   check.add (EqualStatisticsCondition (client, 'transport', '# peers connected', client, 'topology', '# peers connected'))
-  check.add (EqualStatisticsCondition (client, 'topology', '# peers connected', client, 'core', '# entries in session map'))
+  check.add (EqualStatisticsCondition (client, 'topology', '# peers connected', client, 'core', '# peers connected'))
   
   while True:
 	check.reset()
diff --git a/src/integration-tests/test_integration_connection_values_tcp_udp.py.in b/src/integration-tests/test_integration_connection_values_tcp_udp.py.in
index 70877cca1a..11b8266d1e 100755
--- a/src/integration-tests/test_integration_connection_values_tcp_udp.py.in
+++ b/src/integration-tests/test_integration_connection_values_tcp_udp.py.in
@@ -65,10 +65,10 @@ def fail_cont (check):
 def check_connect ():
   check = Check (test)
   check.add (EqualStatisticsCondition (client, 'transport', '# peers connected', client,  'core', '# neighbour entries allocated'))
-  check.add (EqualStatisticsCondition (client, 'transport', '# peers connected', client,  'core', '# entries in session map'))
-  check.add (EqualStatisticsCondition (client, 'core', '# neighbour entries allocated', client,  'core', '# entries in session map'))
+  check.add (EqualStatisticsCondition (client, 'transport', '# peers connected', client,  'core', '# peers connected'))
+  check.add (EqualStatisticsCondition (client, 'core', '# neighbour entries allocated', client,  'core', '# peers connected'))
   check.add (EqualStatisticsCondition (client, 'transport', '# peers connected', client, 'topology', '# peers connected'))
-  check.add (EqualStatisticsCondition (client, 'topology', '# peers connected', client, 'core', '# entries in session map'))
+  check.add (EqualStatisticsCondition (client, 'topology', '# peers connected', client, 'core', '# peers connected'))
   
   while True:
 	check.reset()
diff --git a/src/integration-tests/test_integration_connection_values_tcp_udp_http.py.in b/src/integration-tests/test_integration_connection_values_tcp_udp_http.py.in
index cd4cc9d2e2..69184a2e9a 100755
--- a/src/integration-tests/test_integration_connection_values_tcp_udp_http.py.in
+++ b/src/integration-tests/test_integration_connection_values_tcp_udp_http.py.in
@@ -65,10 +65,10 @@ def fail_cont (check):
 def check_connect ():
   check = Check (test)
   check.add (EqualStatisticsCondition (client, 'transport', '# peers connected', client,  'core', '# neighbour entries allocated'))
-  check.add (EqualStatisticsCondition (client, 'transport', '# peers connected', client,  'core', '# entries in session map'))
-  check.add (EqualStatisticsCondition (client, 'core', '# neighbour entries allocated', client,  'core', '# entries in session map'))
+  check.add (EqualStatisticsCondition (client, 'transport', '# peers connected', client,  'core', '# peers connected'))
+  check.add (EqualStatisticsCondition (client, 'core', '# neighbour entries allocated', client,  'core', '# peers connected'))
   check.add (EqualStatisticsCondition (client, 'transport', '# peers connected', client, 'topology', '# peers connected'))
-  check.add (EqualStatisticsCondition (client, 'topology', '# peers connected', client, 'core', '# entries in session map'))
+  check.add (EqualStatisticsCondition (client, 'topology', '# peers connected', client, 'core', '# peers connected'))
   
   while True:
 	check.reset()
diff --git a/src/integration-tests/test_integration_disconnect.py.in b/src/integration-tests/test_integration_disconnect.py.in
index bd6bc121f7..6f84f37e00 100755
--- a/src/integration-tests/test_integration_disconnect.py.in
+++ b/src/integration-tests/test_integration_disconnect.py.in
@@ -73,7 +73,7 @@ def check_disconnect ():
   check = Check (test)
   check.add (StatisticsCondition (client, 'transport', '# peers connected',0))
   check.add (StatisticsCondition (client, 'core', '# neighbour entries allocated',0))  
-  check.add (StatisticsCondition (client, 'core', '# entries in session map',0))
+  check.add (StatisticsCondition (client, 'core', '# peers connected',0))
   check.add (StatisticsCondition (client, 'topology', '# peers connected',0))
   check.add (StatisticsCondition (client, 'fs', '# peers connected',0))
   check.run_blocking (check_timeout, success_disconnect_cont, fail_disconnect_cont)
@@ -93,13 +93,13 @@ def check_connect ():
   check = Check (test)
   check.add (StatisticsCondition (client, 'transport', '# peers connected',1))
   check.add (StatisticsCondition (client, 'core', '# neighbour entries allocated',1))  
-  check.add (StatisticsCondition (client, 'core', '# entries in session map',1))
+  check.add (StatisticsCondition (client, 'core', '# peers connected',1))
   check.add (StatisticsCondition (client, 'topology', '# peers connected',1))
   check.add (StatisticsCondition (client, 'fs', '# peers connected',1))
   
   check.add (StatisticsCondition (server, 'transport', '# peers connected',1))
   check.add (StatisticsCondition (server, 'core', '# neighbour entries allocated',1))  
-  check.add (StatisticsCondition (server, 'core', '# entries in session map',1))
+  check.add (StatisticsCondition (server, 'core', '# peers connected',1))
   check.add (StatisticsCondition (server, 'topology', '# peers connected',1))
   check.add (StatisticsCondition (server, 'fs', '# peers connected',1))  
   
diff --git a/src/integration-tests/test_integration_restart.py.in b/src/integration-tests/test_integration_restart.py.in
index aadfec5b97..26917d0a09 100755
--- a/src/integration-tests/test_integration_restart.py.in
+++ b/src/integration-tests/test_integration_restart.py.in
@@ -85,13 +85,13 @@ def success_connect_cont (check):
 	check = Check (test)
 	check.add (StatisticsCondition (client, 'transport', '# peers connected',1))
 	check.add (StatisticsCondition (client, 'core', '# neighbour entries allocated',1))  
-	check.add (StatisticsCondition (client, 'core', '# entries in session map',1))
+	check.add (StatisticsCondition (client, 'core', '# peers connected',1))
 	check.add (StatisticsCondition (client, 'topology', '# peers connected',1))
 	check.add (StatisticsCondition (client, 'fs', '# peers connected',1))
 	
 	check.add (StatisticsCondition (server, 'transport', '# peers connected',1))
 	check.add (StatisticsCondition (server, 'core', '# neighbour entries allocated',1))  
-	check.add (StatisticsCondition (server, 'core', '# entries in session map',1))
+	check.add (StatisticsCondition (server, 'core', '# peers connected',1))
 	check.add (StatisticsCondition (server, 'topology', '# peers connected',1))
 	check.add (StatisticsCondition (server, 'fs', '# peers connected',1))  
 	
@@ -108,13 +108,13 @@ def check_connect ():
 	check = Check (test)
 	check.add (StatisticsCondition (client, 'transport', '# peers connected',1))
 	check.add (StatisticsCondition (client, 'core', '# neighbour entries allocated',1))  
-	check.add (StatisticsCondition (client, 'core', '# entries in session map',1))
+	check.add (StatisticsCondition (client, 'core', '# peers connected',1))
 	check.add (StatisticsCondition (client, 'topology', '# peers connected',1))
 	check.add (StatisticsCondition (client, 'fs', '# peers connected',1))
 	
 	check.add (StatisticsCondition (server, 'transport', '# peers connected',1))
 	check.add (StatisticsCondition (server, 'core', '# neighbour entries allocated',1))  
-	check.add (StatisticsCondition (server, 'core', '# entries in session map',1))
+	check.add (StatisticsCondition (server, 'core', '# peers connected',1))
 	check.add (StatisticsCondition (server, 'topology', '# peers connected',1))
 	check.add (StatisticsCondition (server, 'fs', '# peers connected',1))  
 	
diff --git a/src/vpn/gnunet-service-vpn.c b/src/vpn/gnunet-service-vpn.c
index 324671b0c1..b7756a35a7 100644
--- a/src/vpn/gnunet-service-vpn.c
+++ b/src/vpn/gnunet-service-vpn.c
@@ -605,7 +605,7 @@ tunnel_peer_disconnect_handler (void *cls,
 	      "Peer %s disconnected from tunnel.\n",
 	      GNUNET_i2s (peer));
   GNUNET_STATISTICS_update (stats,
-			    gettext_noop ("# Peers connected to mesh tunnels"),
+			    gettext_noop ("# peers connected to mesh tunnels"),
 			    -1, GNUNET_NO);
   if (NULL != ts->th)
   {
@@ -642,7 +642,7 @@ tunnel_peer_connect_handler (void *cls,
 	      "Peer %s connected to tunnel.\n",
 	      GNUNET_i2s (peer));
   GNUNET_STATISTICS_update (stats,
-			    gettext_noop ("# Peers connected to mesh tunnels"),
+			    gettext_noop ("# peers connected to mesh tunnels"),
 			    1, GNUNET_NO);
   if (NULL == ts->client)
     return; /* nothing to do */