Rename policy stubs to be consistent