Renaming of components

Currently, it needs to be rebuilt.