Fixed feature names again