update component names to match the code...