More feature name cleanup.