More facet renaming. Fixed component scanner test.