diff --git a/MacPass/MPContextBarViewController.m b/MacPass/MPContextBarViewController.m
index 984635f8..ec3ce0ac 100644
--- a/MacPass/MPContextBarViewController.m
+++ b/MacPass/MPContextBarViewController.m
@@ -138,12 +138,12 @@ typedef NS_ENUM(NSUInteger, MPContextTab) {
 - (void)_updateFilterButtons {
   MPDocument *document = [[self windowController] document];
   MPEntrySearchFlags currentFlags = document.searchContext.searchFlags;
-  [self.duplicatePasswordsButton setState:HNHStateForBool(MPTestFlagInOptions(MPEntrySearchDoublePasswords, currentFlags))];
-  [self.notesButton setState:HNHStateForBool(MPTestFlagInOptions(MPEntrySearchNotes, currentFlags))];
-  [self.passwordButton setState:HNHStateForBool(MPTestFlagInOptions(MPEntrySearchPasswords, currentFlags))];
-  [self.titleButton setState:HNHStateForBool(MPTestFlagInOptions(MPEntrySearchTitles, currentFlags))];
-  [self.urlButton setState:HNHStateForBool(MPTestFlagInOptions(MPEntrySearchUrls, currentFlags))];
-  [self.usernameButton setState:HNHStateForBool(MPTestFlagInOptions(MPEntrySearchUsernames, currentFlags))];
+  [self.duplicatePasswordsButton setState:HNHStateForBool(MPIsFlagSetInOptions(MPEntrySearchDoublePasswords, currentFlags))];
+  [self.notesButton setState:HNHStateForBool(MPIsFlagSetInOptions(MPEntrySearchNotes, currentFlags))];
+  [self.passwordButton setState:HNHStateForBool(MPIsFlagSetInOptions(MPEntrySearchPasswords, currentFlags))];
+  [self.titleButton setState:HNHStateForBool(MPIsFlagSetInOptions(MPEntrySearchTitles, currentFlags))];
+  [self.urlButton setState:HNHStateForBool(MPIsFlagSetInOptions(MPEntrySearchUrls, currentFlags))];
+  [self.usernameButton setState:HNHStateForBool(MPIsFlagSetInOptions(MPEntrySearchUsernames, currentFlags))];
   NSInteger selectedTag = MPEntrySearchNone;
   for(NSMenuItem *item in [[self.specialFilterPopUpButton menu] itemArray]) {
     MPEntrySearchFlags flag = [item tag];
@@ -152,7 +152,7 @@ typedef NS_ENUM(NSUInteger, MPContextTab) {
       [item setEnabled:NO];
     }
     else {
-      BOOL isActive = MPTestFlagInOptions(flag, currentFlags);
+      BOOL isActive = MPIsFlagSetInOptions(flag, currentFlags);
       if(isActive) {
         selectedTag = flag;
       }
diff --git a/MacPass/MPContextMenuHelper.m b/MacPass/MPContextMenuHelper.m
index d1fb6597..5a816fa7 100644
--- a/MacPass/MPContextMenuHelper.m
+++ b/MacPass/MPContextMenuHelper.m
@@ -21,11 +21,11 @@ static void MPContextmenuHelperBeginSection(NSMutableArray *items) {
 
 + (NSArray *)contextMenuItemsWithItems:(MPContextMenuItemsFlags)flags {
   
-  BOOL const insertCreate = MPTestFlagInOptions(MPContextMenuCreate, flags);
-  BOOL const insertDelete = MPTestFlagInOptions(MPContextMenuDelete, flags);
-  BOOL const insertCopy = MPTestFlagInOptions(MPContextMenuCopy, flags);
-  BOOL const insertTrash = MPTestFlagInOptions(MPContextMenuTrash, flags);
-  BOOL const insertClone = MPTestFlagInOptions(MPContextMenuClone, flags);
+  BOOL const insertCreate = MPIsFlagSetInOptions(MPContextMenuCreate, flags);
+  BOOL const insertDelete = MPIsFlagSetInOptions(MPContextMenuDelete, flags);
+  BOOL const insertCopy = MPIsFlagSetInOptions(MPContextMenuCopy, flags);
+  BOOL const insertTrash = MPIsFlagSetInOptions(MPContextMenuTrash, flags);
+  BOOL const insertClone = MPIsFlagSetInOptions(MPContextMenuClone, flags);
   
   NSMutableArray *items = [NSMutableArray arrayWithCapacity:10];
   if(insertCreate) {
diff --git a/MacPass/MPDocument+Search.m b/MacPass/MPDocument+Search.m
index faed64a8..1db04a95 100644
--- a/MacPass/MPDocument+Search.m
+++ b/MacPass/MPDocument+Search.m
@@ -113,7 +113,7 @@ NSString *const kMPDocumentSearchResultsKey           = @"kMPDocumentSearchResul
 #pragma mark Search
 - (NSArray *)_findEntriesMatchingCurrentSearch {
   /* Filter double passwords */
-  if(MPTestFlagInOptions(MPEntrySearchDoublePasswords, self.searchContext.searchFlags)) {
+  if(MPIsFlagSetInOptions(MPEntrySearchDoublePasswords, self.searchContext.searchFlags)) {
     __block NSMutableDictionary *passwordToEntryMap = [[NSMutableDictionary alloc] initWithCapacity:100];
     /* Build up a usage map */
     [[self.root childEntries] enumerateObjectsUsingBlock:^(id obj, NSUInteger idx, BOOL *stop) {
@@ -139,7 +139,7 @@ NSString *const kMPDocumentSearchResultsKey           = @"kMPDocumentSearchResul
     }];
     return doublePasswords;
   }
-  if(MPTestFlagInOptions(MPEntrySearchExpiredEntries, self.searchContext.searchFlags)) {
+  if(MPIsFlagSetInOptions(MPEntrySearchExpiredEntries, self.searchContext.searchFlags)) {
     NSPredicate *expiredPredicate = [NSPredicate predicateWithBlock:^BOOL(id evaluatedObject, NSDictionary *bindings) {
       KPKNode *node = evaluatedObject;
       return node.timeInfo.isExpired;
@@ -159,19 +159,19 @@ NSString *const kMPDocumentSearchResultsKey           = @"kMPDocumentSearchResul
 - (NSArray *)_filterPredicatesWithString:(NSString *)string{
   NSMutableArray *prediactes = [[NSMutableArray alloc] initWithCapacity:4];
   
-  if(MPTestFlagInOptions(MPEntrySearchTitles, self.searchContext.searchFlags)) {
+  if(MPIsFlagSetInOptions(MPEntrySearchTitles, self.searchContext.searchFlags)) {
     [prediactes addObject:[NSPredicate predicateWithFormat:@"SELF.title CONTAINS[cd] %@", string]];
   }
-  if(MPTestFlagInOptions(MPEntrySearchUsernames, self.searchContext.searchFlags)) {
+  if(MPIsFlagSetInOptions(MPEntrySearchUsernames, self.searchContext.searchFlags)) {
     [prediactes addObject:[NSPredicate predicateWithFormat:@"SELF.username CONTAINS[cd] %@", string]];
   }
-  if(MPTestFlagInOptions(MPEntrySearchUrls, self.searchContext.searchFlags)) {
+  if(MPIsFlagSetInOptions(MPEntrySearchUrls, self.searchContext.searchFlags)) {
     [prediactes addObject:[NSPredicate predicateWithFormat:@"SELF.url CONTAINS[cd] %@", string]];
   }
-  if(MPTestFlagInOptions(MPEntrySearchPasswords, self.searchContext.searchFlags)) {
+  if(MPIsFlagSetInOptions(MPEntrySearchPasswords, self.searchContext.searchFlags)) {
     [prediactes addObject:[NSPredicate predicateWithFormat:@"SELF.password CONTAINS[cd] %@", string]];
   }
-  if(MPTestFlagInOptions(MPEntrySearchNotes, self.searchContext.searchFlags)) {
+  if(MPIsFlagSetInOptions(MPEntrySearchNotes, self.searchContext.searchFlags)) {
     [prediactes addObject:[NSPredicate predicateWithFormat:@"SELF.notes CONTAINS[cd] %@", string]];
   }
   return prediactes;
diff --git a/MacPass/MPFlagsHelper.h b/MacPass/MPFlagsHelper.h
index c1724e45..bee619c6 100644
--- a/MacPass/MPFlagsHelper.h
+++ b/MacPass/MPFlagsHelper.h
@@ -20,5 +20,5 @@
  *
  *  @return YES if any bit of flag is set in mode
  */
-FOUNDATION_EXTERN BOOL MPTestFlagInOptions(const NSUInteger flag, const NSUInteger options );
+FOUNDATION_EXTERN BOOL MPIsFlagSetInOptions(const NSUInteger flag, const NSUInteger options );
 #endif
diff --git a/MacPass/MPFlagsHelper.m b/MacPass/MPFlagsHelper.m
index fa758947..15fde702 100644
--- a/MacPass/MPFlagsHelper.m
+++ b/MacPass/MPFlagsHelper.m
@@ -8,6 +8,6 @@
 
 #import "MPFlagsHelper.h"
 
-BOOL MPTestFlagInOptions(const NSUInteger flag, const NSUInteger options ) {
+BOOL MPIsFlagSetInOptions(const NSUInteger flag, const NSUInteger options ) {
   return (0 != (options & flag));
 }
diff --git a/MacPass/MPPasswordCreatorViewController.m b/MacPass/MPPasswordCreatorViewController.m
index 8d264f27..05d97811 100644
--- a/MacPass/MPPasswordCreatorViewController.m
+++ b/MacPass/MPPasswordCreatorViewController.m
@@ -12,6 +12,7 @@
 #import "MPUniqueCharactersFormatter.h"
 #import "MPSettingsHelper.h"
 
+#import "MPFlagsHelper.h"
 #import "KPKEntry.h"
 
 /*