Fix bug(s) added in metric name prepend addition

Fix bug(s) added in metric name prepend addition