fixing components for name changes