some changes about names