Components renamed to match new layout
Components renamed to match new layout