Merge "Adapt feature names change in docs"