Fixed name bug