Finished work on renaming a policy. Fixes #7