Added separate component names and instantiations.