Fixed mistake(duplicated names)
Fixed duplicate names