Rename type.* to base.*.