Fixed broken integration tests due to renaming components

Fixed broken integration tests due to renaming components