Fixed the Name Bug