Name bug fixed