diff --git a/server.js b/server.js
index e427f0c..d1826a3 100644
--- a/server.js
+++ b/server.js
@@ -67,7 +67,7 @@ function(data, match, end, ask) {
         badge(badgeData, makeSend(format, ask.res, end));
         return;
       }
-      badgeData.text[1] = '$' + metric(money) + ' /week';
+      badgeData.text[1] = '$' + metric(money) + '/week';
       if (money === 0) {
         badgeData.colorscheme = 'red';
       } else if (money < 10) {
@@ -105,7 +105,7 @@ function(data, match, end, ask) {
         badge(badgeData, makeSend(format, ask.res, end));
         return;
       }
-      badgeData.text[1] = metric(monthly) + ' /month';
+      badgeData.text[1] = metric(monthly) + '/month';
       if (monthly === 0) {
         badgeData.colorscheme = 'red';
       } else if (monthly < 10) {
@@ -155,7 +155,7 @@ function(data, match, end, ask) {
         badge(badgeData, makeSend(format, ask.res, end));
         return;
       }
-      badgeData.text[1] = metric(monthly) + ' /month';
+      badgeData.text[1] = metric(monthly) + '/month';
       if (monthly === 0) {
         badgeData.colorscheme = 'red';
       } else if (monthly < 10) {
@@ -193,7 +193,7 @@ function(data, match, end, ask) {
         badge(badgeData, makeSend(format, ask.res, end));
         return;
       }
-      badgeData.text[1] = version;
+      badgeData.text[1] = 'v' + version;
       if (version[0] === '0' || /dev/.test(version)) {
         badgeData.colorscheme = 'orange';
       } else {
@@ -227,7 +227,7 @@ function(data, match, end, ask) {
         badge(badgeData, makeSend(format, ask.res, end));
         return;
       }
-      badgeData.text[1] = version;
+      badgeData.text[1] = 'v' + version;
       if (version[0] === '0' || /dev/.test(version)) {
         badgeData.colorscheme = 'orange';
       } else {
diff --git a/web/index.html b/web/index.html
index 286b7a7..7486e0a 100644
--- a/web/index.html
+++ b/web/index.html
@@ -99,16 +99,16 @@ Use an underscore <code>_</code> if you want a space. Or, you know, use a space.
   <td><code>http://gh-badges.herokuapp.com/coveralls/jekyll/jekyll.svg</code></td>
   </tr>
   </tr>
-  <tr><th> NPM: </th>
-  <td><img src='/npm/dm/localeval.svg' alt='NPM'/></td>
+  <tr><th> npm: </th>
+  <td><img src='/npm/dm/localeval.svg' alt='npm'/></td>
   <td><code>http://gh-badges.herokuapp.com/npm/dm/localeval.svg</code></td>
   </tr>
   <tr><th> Packagist: </th>
   <td><img src='/packagist/dm/doctrine/orm.svg' alt='Packagist'/></td>
   <td><code>http://gh-badges.herokuapp.com/packagist/dm/doctrine/orm.svg</code></td>
   </tr>
-  <tr><th> NPM: </th>
-  <td><img src='/npm/v/npm.svg' alt='NPM'/></td>
+  <tr><th> npm: </th>
+  <td><img src='/npm/v/npm.svg' alt='npm'/></td>
   <td><code>http://gh-badges.herokuapp.com/npm/v/npm.svg</code></td>
   </tr>
   <tr><th> Gem: </th>