Use base_prefix instead of prefix

Update to #2385