Rename to reflect inclusion of all core components