Fix Bug 1106994 friendly source names