Change Name and bug fixed