Changed the way metric names and source names are constructed.