CoreHome -> General for consistency.
Fix translations to make tests pass again