still more feature name improvement