Fix legacy policy type names