Rename SA Policy Tags taxonomy

Also fix conflicting function names