Fixed the name tag at source