Minor components renaming