Name bug fix