Cleanup and renaming to match other permission libs