Corrected port name errors in components and instantiations.