Revert usage of ComponentStoreType for clarity