Replaced naming of features.