Another source name cleanup