diff --git a/src/main/webapp/scripts/directives/linkInfoDetails.js b/src/main/webapp/scripts/directives/linkInfoDetails.js
index 05f82d57a..20bf0ed63 100644
--- a/src/main/webapp/scripts/directives/linkInfoDetails.js
+++ b/src/main/webapp/scripts/directives/linkInfoDetails.js
@@ -99,10 +99,10 @@ pinpointApp.directive('linkInfoDetails', [ 'linkInfoDetailsConfig', 'HelixChartV
                         data: {
                             from: query.from,
                             to: query.to,
-                            srcServiceType: query.srcServiceType,
-                            srcApplicationName: query.srcApplicationName,
-                            destServiceType: query.destServiceType,
-                            destApplicationName: query.destApplicationName,
+                            sourceServiceType: query.sourceServiceType,
+                            sourceApplicationName: query.sourceApplicationName,
+                            targetServiceType: query.targetServiceType,
+                            targetApplicationName: query.targetApplicationName,
                             v: version
                         },
                         success: function (result) {
@@ -213,10 +213,10 @@ pinpointApp.directive('linkInfoDetails', [ 'linkInfoDetailsConfig', 'HelixChartV
 //                                    label: e.point.label,
 //                                    value: e.value,
 //                                    values: e.series.values,
-//                                    srcServiceType: scope.sourceinfo.serviceType,
-//                                    srcApplicationName: scope.sourceinfo.applicationName,
-//                                    destServiceType: scope.targetinfo.serviceType,
-//                                    destApplicationName: scope.targetinfo.applicationName
+//                                    sourceServiceType: scope.sourceinfo.serviceType,
+//                                    sourceApplicationName: scope.sourceinfo.applicationName,
+//                                    targetServiceType: scope.targetinfo.serviceType,
+//                                    targetApplicationName: scope.targetinfo.applicationName
 //                                };
                                 var label = e.point.label,
                                     values = e.series.values;
@@ -257,21 +257,21 @@ pinpointApp.directive('linkInfoDetails', [ 'linkInfoDetailsConfig', 'HelixChartV
                  * show application statistics
                  * @param begin
                  * @param end
-                 * @param srcServiceType
-                 * @param srcApplicationName
-                 * @param destServiceType
-                 * @param destApplicationName
+                 * @param sourceServiceType
+                 * @param sourceApplicationName
+                 * @param targetServiceType
+                 * @param targetApplicationName
                  * @param histogram
                  */
-                showApplicationStatistics = function (begin, end, srcServiceType, srcApplicationName, destServiceType,
-                                                      destApplicationName, histogram) {
+                showApplicationStatistics = function (begin, end, sourceServiceType, sourceApplicationName, targetServiceType,
+                                                      targetApplicationName, histogram) {
                     var params = {
                         "from": begin,
                         "to": end,
-                        "srcServiceType": srcServiceType,
-                        "srcApplicationName": srcApplicationName,
-                        "destServiceType": destServiceType,
-                        "destApplicationName": destApplicationName
+                        "sourceServiceType": sourceServiceType,
+                        "sourceApplicationName": sourceApplicationName,
+                        "targetServiceType": targetServiceType,
+                        "targetApplicationName": targetApplicationName
                     };
 
                     scope.showLinkInfoChart = true;
@@ -279,7 +279,7 @@ pinpointApp.directive('linkInfoDetails', [ 'linkInfoDetailsConfig', 'HelixChartV
                     renderStatisticsSummary('.linkInfoDetails .infoBarChart svg', parseHistogramForD3(histogram), 'ResponseSummary');
 
                     getLinkStatisticsData(params, 1, function (query, result) {
-                        renderStatisticsTimeSeriesHistogram(result.timeseriesHistogram);
+                        renderStatisticsTimeSeriesHistogram(result.timeSeriesHistogram);
                     });
 
 //                    getLinkStatisticsData(params, 2, function (query, result) {
diff --git a/src/main/webapp/scripts/directives/nodeInfoDetails.js b/src/main/webapp/scripts/directives/nodeInfoDetails.js
index f69419be4..edaf8190f 100644
--- a/src/main/webapp/scripts/directives/nodeInfoDetails.js
+++ b/src/main/webapp/scripts/directives/nodeInfoDetails.js
@@ -52,8 +52,6 @@ pinpointApp
                     scope.isWas = node.isWas;
                     scope.agentHistogram = node.agentHistogram;
 
-                    console.log('node', node);
-
                     if (!node.rawdata && /*node.category !== "USER" &&*/ node.category !== "UNKNOWN_GROUP") {
                         renderApplicationStatistics([
                             {
@@ -73,7 +71,6 @@ pinpointApp
                     } else if (node.category === 'UNKNOWN_GROUP'){
 
                         for (var key in node.textArr) {
-                            console.log('.nodeInfoDetails .summaryCharts_' + key + ' svg');
                             renderStatisticsSummary('.nodeInfoDetails .summaryCharts_' + key +
                                 ' svg', parseHistogramForD3(node.rawdata[node.textArr[key].applicationName].histogram));
                         }
diff --git a/src/main/webapp/scripts/filters/applicationNameToClassName.js b/src/main/webapp/scripts/filters/applicationNameToClassName.js
index 7cef5394a..cd06eefab 100644
--- a/src/main/webapp/scripts/filters/applicationNameToClassName.js
+++ b/src/main/webapp/scripts/filters/applicationNameToClassName.js
@@ -2,6 +2,6 @@
 
 pinpointApp.filter('applicationNameToClassName', function () {
     return function (input) {
-        return input.replace(/\./gi,'_').replace(/\^/gi,'~');
+        return input.replace(/\./gi,'_').replace(/\^/gi,'_').replace(/:/gi, '_');
     };
 });