From b29c7969edb5a5ae99a38f8b3d2c94ea43287d8e Mon Sep 17 00:00:00 2001
From: Nick Hall <nick__hall@hotmail.com>
Date: Thu, 24 May 2012 20:11:28 +0000
Subject: [PATCH] GEPS008: Convert filter filenames to lower case

svn: r19639
---
 po/POTFILES.in                                | 450 +++++++++---------
 po/POTFILES.skip                              |  56 +--
 src/gen/filters/Makefile.am                   |  10 +-
 src/gen/filters/__init__.py                   |   8 +-
 .../{_FilterList.py => _filterlist.py}        |   0
 .../{_FilterParser.py => _filterparser.py}    |   0
 .../{_GenericFilter.py => _genericfilter.py}  |   0
 .../{_ParamFilter.py => _paramfilter.py}      |   0
 .../{_SearchFilter.py => _searchfilter.py}    |   0
 src/gen/filters/rules/Makefile.am             |  50 +-
 src/gen/filters/rules/__init__.py             |  24 +-
 ...angedSinceBase.py => _changedsincebase.py} |   0
 .../rules/{_Everything.py => _everything.py}  |   0
 ...sAttributeBase.py => _hasattributebase.py} |   0
 ...HasCitationBase.py => _hascitationbase.py} |   0
 .../{_HasEventBase.py => _haseventbase.py}    |   0
 ...{_HasGalleryBase.py => _hasgallerybase.py} |   0
 .../{_HasGrampsId.py => _hasgrampsid.py}      |   0
 .../rules/{_HasLDSBase.py => _hasldsbase.py}  |   0
 .../{_HasNoteBase.py => _hasnotebase.py}      |   0
 ...sNoteRegexBase.py => _hasnoteregexbase.py} |   0
 ...oteSubstrBase.py => _hasnotesubstrbase.py} |   0
 ...CountBase.py => _hasreferencecountbase.py} |   0
 .../{_HasSourceBase.py => _hassourcebase.py}  |   0
 ...rceCountBase.py => _hassourcecountbase.py} |   0
 .../rules/{_HasTagBase.py => _hastagbase.py}  |   0
 ...egexpOf.py => _hastextmatchingregexpof.py} |   0
 ...ngOf.py => _hastextmatchingsubstringof.py} |   0
 .../rules/{_IsPrivate.py => _isprivate.py}    |   0
 .../rules/{_IsPublic.py => _ispublic.py}      |   0
 ...lterBase.py => _matcheseventfilterbase.py} |   0
 ...hesFilterBase.py => _matchesfilterbase.py} |   0
 ...ase.py => _matchessourceconfidencebase.py} |   0
 ...terBase.py => _matchessourcefilterbase.py} |   0
 .../{_RegExpIdBase.py => _regexpidbase.py}    |   0
 src/gen/filters/rules/{_Rule.py => _rule.py}  |   0
 src/gen/filters/rules/citation/Makefile.am    |  30 +-
 src/gen/filters/rules/citation/__init__.py    |  32 +-
 .../{_AllCitations.py => _allcitations.py}    |   0
 .../{_ChangedSince.py => _changedsince.py}    |   0
 ...CitationPrivate.py => _citationprivate.py} |   0
 .../{_HasGallery.py => _hasgallery.py}        |   0
 .../citation/{_HasIdOf.py => _hasidof.py}     |   0
 .../citation/{_HasNote.py => _hasnote.py}     |   0
 ...ngOf.py => _hasnotematchingsubstringof.py} |   0
 .../{_HasNoteRegexp.py => _hasnoteregexp.py}  |   0
 ...enceCountOf.py => _hasreferencecountof.py} |   0
 .../citation/{_HasSource.py => _hassource.py} |   0
 .../{_MatchesFilter.py => _matchesfilter.py}  |   0
 ...stringOf.py => _matchespagesubstringof.py} |   0
 ...yFilter.py => _matchesrepositoryfilter.py} |   0
 ...ourceFilter.py => _matchessourcefilter.py} |   0
 .../{_RegExpIdOf.py => _regexpidof.py}        |   0
 src/gen/filters/rules/event/Makefile.am       |  38 +-
 src/gen/filters/rules/event/__init__.py       |  40 +-
 .../event/{_AllEvents.py => _allevents.py}    |   0
 .../{_ChangedSince.py => _changedsince.py}    |   0
 .../{_EventPrivate.py => _eventprivate.py}    |   0
 .../{_HasAttribute.py => _hasattribute.py}    |   0
 .../{_HasCitation.py => _hascitation.py}      |   0
 .../rules/event/{_HasData.py => _hasdata.py}  |   0
 .../event/{_HasGallery.py => _hasgallery.py}  |   0
 .../rules/event/{_HasIdOf.py => _hasidof.py}  |   0
 .../rules/event/{_HasNote.py => _hasnote.py}  |   0
 ...ngOf.py => _hasnotematchingsubstringof.py} |   0
 .../{_HasNoteRegexp.py => _hasnoteregexp.py}  |   0
 ...enceCountOf.py => _hasreferencecountof.py} |   0
 ...{_HasSourceCount.py => _hassourcecount.py} |   0
 .../rules/event/{_HasType.py => _hastype.py}  |   0
 .../{_MatchesFilter.py => _matchesfilter.py}  |   0
 ...ersonFilter.py => _matchespersonfilter.py} |   0
 ...fidence.py => _matchessourceconfidence.py} |   0
 ...ourceFilter.py => _matchessourcefilter.py} |   0
 .../event/{_RegExpIdOf.py => _regexpidof.py}  |   0
 src/gen/filters/rules/family/Makefile.am      |  66 +--
 src/gen/filters/rules/family/__init__.py      |  64 +--
 .../{_AllFamilies.py => _allfamilies.py}      |   0
 .../{_ChangedSince.py => _changedsince.py}    |   0
 .../{_ChildHasIdOf.py => _childhasidof.py}    |   0
 ...{_ChildHasNameOf.py => _childhasnameof.py} |   0
 .../{_FamilyPrivate.py => _familyprivate.py}  |   0
 .../{_FatherHasIdOf.py => _fatherhasidof.py}  |   0
 ...FatherHasNameOf.py => _fatherhasnameof.py} |   0
 .../{_HasAttribute.py => _hasattribute.py}    |   0
 .../{_HasCitation.py => _hascitation.py}      |   0
 .../family/{_HasEvent.py => _hasevent.py}     |   0
 .../family/{_HasGallery.py => _hasgallery.py} |   0
 .../rules/family/{_HasIdOf.py => _hasidof.py} |   0
 .../rules/family/{_HasLDS.py => _haslds.py}   |   0
 .../rules/family/{_HasNote.py => _hasnote.py} |   0
 ...ngOf.py => _hasnotematchingsubstringof.py} |   0
 .../{_HasNoteRegexp.py => _hasnoteregexp.py}  |   0
 ...enceCountOf.py => _hasreferencecountof.py} |   0
 .../family/{_HasRelType.py => _hasreltype.py} |   0
 ...{_HasSourceCount.py => _hassourcecount.py} |   0
 .../rules/family/{_HasTag.py => _hastag.py}   |   0
 .../{_IsBookmarked.py => _isbookmarked.py}    |   0
 .../{_MatchesFilter.py => _matchesfilter.py}  |   0
 ...fidence.py => _matchessourceconfidence.py} |   0
 .../family/{_MemberBase.py => _memberbase.py} |   0
 .../{_MotherHasIdOf.py => _motherhasidof.py}  |   0
 ...MotherHasNameOf.py => _motherhasnameof.py} |   0
 ...RegExpChildName.py => _regexpchildname.py} |   0
 ...gExpFatherName.py => _regexpfathername.py} |   0
 .../family/{_RegExpIdOf.py => _regexpidof.py} |   0
 ...gExpMotherName.py => _regexpmothername.py} |   0
 ...SearchChildName.py => _searchchildname.py} |   0
 ...archFatherName.py => _searchfathername.py} |   0
 ...archMotherName.py => _searchmothername.py} |   0
 src/gen/filters/rules/media/Makefile.am       |  24 +-
 src/gen/filters/rules/media/__init__.py       |  24 +-
 .../media/{_AllMedia.py => _allmedia.py}      |   0
 .../{_ChangedSince.py => _changedsince.py}    |   0
 .../{_HasAttribute.py => _hasattribute.py}    |   0
 .../rules/media/{_HasIdOf.py => _hasidof.py}  |   0
 .../media/{_HasMedia.py => _hasmedia.py}      |   0
 ...ngOf.py => _hasnotematchingsubstringof.py} |   0
 .../{_HasNoteRegexp.py => _hasnoteregexp.py}  |   0
 ...enceCountOf.py => _hasreferencecountof.py} |   0
 .../rules/media/{_HasTag.py => _hastag.py}    |   0
 .../{_MatchesFilter.py => _matchesfilter.py}  |   0
 .../{_MediaPrivate.py => _mediaprivate.py}    |   0
 .../media/{_RegExpIdOf.py => _regexpidof.py}  |   0
 src/gen/filters/rules/note/Makefile.am        |  22 +-
 src/gen/filters/rules/note/__init__.py        |  22 +-
 .../rules/note/{_AllNotes.py => _allnotes.py} |   0
 .../{_ChangedSince.py => _changedsince.py}    |   0
 .../rules/note/{_HasIdOf.py => _hasidof.py}   |   0
 .../rules/note/{_HasNote.py => _hasnote.py}   |   0
 ...enceCountOf.py => _hasreferencecountof.py} |   0
 .../rules/note/{_HasTag.py => _hastag.py}     |   0
 .../{_MatchesFilter.py => _matchesfilter.py}  |   0
 ...MatchesRegexpOf.py => _matchesregexpof.py} |   0
 ...sSubstringOf.py => _matchessubstringof.py} |   0
 .../note/{_NotePrivate.py => _noteprivate.py} |   0
 .../note/{_RegExpIdOf.py => _regexpidof.py}   |   0
 src/gen/filters/rules/person/Makefile.am      | 156 +++---
 src/gen/filters/rules/person/__init__.py      | 156 +++---
 .../{_ChangedSince.py => _changedsince.py}    |   0
 ...een.py => _deeprelationshippathbetween.py} |   0
 .../{_Disconnected.py => _disconnected.py}    |   0
 .../person/{_Everyone.py => _everyone.py}     |   0
 ...Event.py => _familywithincompleteevent.py} |   0
 .../person/{_HasAddress.py => _hasaddress.py} |   0
 ...sAlternateName.py => _hasalternatename.py} |   0
 ...{_HasAssociation.py => _hasassociation.py} |   0
 .../{_HasAttribute.py => _hasattribute.py}    |   0
 .../person/{_HasBirth.py => _hasbirth.py}     |   0
 .../{_HasCitation.py => _hascitation.py}      |   0
 ...estorWith.py => _hascommonancestorwith.py} |   0
 ...y => _hascommonancestorwithfiltermatch.py} |   0
 .../person/{_HasDeath.py => _hasdeath.py}     |   0
 .../person/{_HasEvent.py => _hasevent.py}     |   0
 ...ilyAttribute.py => _hasfamilyattribute.py} |   0
 ...{_HasFamilyEvent.py => _hasfamilyevent.py} |   0
 .../person/{_HasGallery.py => _hasgallery.py} |   0
 .../rules/person/{_HasIdOf.py => _hasidof.py} |   0
 .../rules/person/{_HasLDS.py => _haslds.py}   |   0
 .../person/{_HasNameOf.py => _hasnameof.py}   |   0
 ...ameOriginType.py => _hasnameorigintype.py} |   0
 .../{_HasNameType.py => _hasnametype.py}      |   0
 .../{_HasNickname.py => _hasnickname.py}      |   0
 .../rules/person/{_HasNote.py => _hasnote.py} |   0
 ...ngOf.py => _hasnotematchingsubstringof.py} |   0
 .../{_HasNoteRegexp.py => _hasnoteregexp.py}  |   0
 ...HasRelationship.py => _hasrelationship.py} |   0
 ...{_HasSourceCount.py => _hassourcecount.py} |   0
 .../{_HasSourceOf.py => _hassourceof.py}      |   0
 .../rules/person/{_HasTag.py => _hastag.py}   |   0
 ...egexpOf.py => _hastextmatchingregexpof.py} |   0
 ...ngOf.py => _hastextmatchingsubstringof.py} |   0
 ...sUnknownGender.py => _hasunknowngender.py} |   0
 ...HaveAltFamilies.py => _havealtfamilies.py} |   0
 .../{_HaveChildren.py => _havechildren.py}    |   0
 ...IncompleteNames.py => _incompletenames.py} |   0
 .../{_IsAncestorOf.py => _isancestorof.py}    |   0
 ...erMatch.py => _isancestoroffiltermatch.py} |   0
 .../{_IsBookmarked.py => _isbookmarked.py}    |   0
 ...ilterMatch.py => _ischildoffiltermatch.py} |   0
 ...IsDefaultPerson.py => _isdefaultperson.py} |   0
 ...ntFamilyOf.py => _isdescendantfamilyof.py} |   0
 ...py => _isdescendantfamilyoffiltermatch.py} |   0
 ...{_IsDescendantOf.py => _isdescendantof.py} |   0
 ...Match.py => _isdescendantoffiltermatch.py} |   0
 ...cestorOf.py => _isduplicatedancestorof.py} |   0
 .../person/{_IsFemale.py => _isfemale.py}     |   0
 ... => _islessthannthgenerationancestorof.py} |   0
 ...sthannthgenerationancestorofbookmarked.py} |   0
 ...annthgenerationancestorofdefaultperson.py} |   0
 ...> _islessthannthgenerationdescendantof.py} |   0
 .../rules/person/{_IsMale.py => _ismale.py}   |   0
 ... => _ismorethannthgenerationancestorof.py} |   0
 ...> _ismorethannthgenerationdescendantof.py} |   0
 ...lterMatch.py => _isparentoffiltermatch.py} |   0
 .../{_IsRelatedWith.py => _isrelatedwith.py}  |   0
 ...terMatch.py => _issiblingoffiltermatch.py} |   0
 ...lterMatch.py => _isspouseoffiltermatch.py} |   0
 .../person/{_IsWitness.py => _iswitness.py}   |   0
 ...sEventFilter.py => _matcheseventfilter.py} |   0
 .../{_MatchesFilter.py => _matchesfilter.py}  |   0
 ...fidence.py => _matchessourceconfidence.py} |   0
 .../person/{_MatchIdOf.py => _matchidof.py}   |   0
 .../{_MissingParent.py => _missingparent.py}  |   0
 ...ipleMarriages.py => _multiplemarriages.py} |   0
 .../{_NeverMarried.py => _nevermarried.py}    |   0
 .../{_NoBirthdate.py => _nobirthdate.py}      |   0
 .../{_NoDeathdate.py => _nodeathdate.py}      |   0
 .../{_PeoplePrivate.py => _peopleprivate.py}  |   0
 .../{_PeoplePublic.py => _peoplepublic.py}    |   0
 ...Event.py => _personwithincompleteevent.py} |   0
 .../{_ProbablyAlive.py => _probablyalive.py}  |   0
 .../person/{_RegExpIdOf.py => _regexpidof.py} |   0
 .../person/{_RegExpName.py => _regexpname.py} |   0
 ...Between.py => _relationshippathbetween.py} |   0
 ...y => _relationshippathbetweenbookmarks.py} |   0
 .../person/{_SearchName.py => _searchname.py} |   0
 src/gen/filters/rules/place/Makefile.am       |  30 +-
 src/gen/filters/rules/place/__init__.py       |  30 +-
 .../place/{_AllPlaces.py => _allplaces.py}    |   0
 .../{_ChangedSince.py => _changedsince.py}    |   0
 .../place/{_HasGallery.py => _hasgallery.py}  |   0
 .../rules/place/{_HasIdOf.py => _hasidof.py}  |   0
 .../{_HasNoLatOrLon.py => _hasnolatorlon.py}  |   0
 .../rules/place/{_HasNote.py => _hasnote.py}  |   0
 ...ngOf.py => _hasnotematchingsubstringof.py} |   0
 .../{_HasNoteRegexp.py => _hasnoteregexp.py}  |   0
 .../place/{_HasPlace.py => _hasplace.py}      |   0
 ...enceCountOf.py => _hasreferencecountof.py} |   0
 ...ighborhood.py => _inlatlonneighborhood.py} |   0
 ...sEventFilter.py => _matcheseventfilter.py} |   0
 .../{_MatchesFilter.py => _matchesfilter.py}  |   0
 .../{_PlacePrivate.py => _placeprivate.py}    |   0
 .../place/{_RegExpIdOf.py => _regexpidof.py}  |   0
 src/gen/filters/rules/repository/Makefile.am  |  22 +-
 src/gen/filters/rules/repository/__init__.py  |  22 +-
 .../repository/{_AllRepos.py => _allrepos.py} |   0
 .../{_ChangedSince.py => _changedsince.py}    |   0
 .../repository/{_HasIdOf.py => _hasidof.py}   |   0
 ...ngOf.py => _hasnotematchingsubstringof.py} |   0
 .../{_HasNoteRegexp.py => _hasnoteregexp.py}  |   0
 ...enceCountOf.py => _hasreferencecountof.py} |   0
 .../repository/{_HasRepo.py => _hasrepo.py}   |   0
 .../{_MatchesFilter.py => _matchesfilter.py}  |   0
 ...stringOf.py => _matchesnamesubstringof.py} |   0
 .../{_RegExpIdOf.py => _regexpidof.py}        |   0
 .../{_RepoPrivate.py => _repoprivate.py}      |   0
 src/gen/filters/rules/source/Makefile.am      |  30 +-
 src/gen/filters/rules/source/__init__.py      |  32 +-
 .../source/{_AllSources.py => _allsources.py} |   0
 .../{_ChangedSince.py => _changedsince.py}    |   0
 .../source/{_HasGallery.py => _hasgallery.py} |   0
 .../rules/source/{_HasIdOf.py => _hasidof.py} |   0
 .../rules/source/{_HasNote.py => _hasnote.py} |   0
 ...ngOf.py => _hasnotematchingsubstringof.py} |   0
 .../{_HasNoteRegexp.py => _hasnoteregexp.py}  |   0
 ...enceCountOf.py => _hasreferencecountof.py} |   0
 .../{_HasRepository.py => _hasrepository.py}  |   0
 ...rRef.py => _hasrepositorycallnumberref.py} |   0
 .../{_MatchesFilter.py => _matchesfilter.py}  |   0
 ...yFilter.py => _matchesrepositoryfilter.py} |   0
 ...tringOf.py => _matchestitlesubstringof.py} |   0
 .../source/{_RegExpIdOf.py => _regexpidof.py} |   0
 .../{_SourcePrivate.py => _sourceprivate.py}  |   0
 src/gui/filters/Makefile.am                   |   8 +-
 src/gui/filters/__init__.py                   |   8 +-
 ...{_FilterComboBox.py => _filtercombobox.py} |   0
 .../{_FilterMenu.py => _filtermenu.py}        |   0
 .../{_FilterStore.py => _filterstore.py}      |   0
 .../filters/{_SearchBar.py => _searchbar.py}  |   0
 src/gui/filters/sidebar/Makefile.am           |  20 +-
 src/gui/filters/sidebar/__init__.py           |  20 +-
 ...barFilter.py => _citationsidebarfilter.py} |   0
 ...idebarFilter.py => _eventsidebarfilter.py} |   0
 ...debarFilter.py => _familysidebarfilter.py} |   0
 ...idebarFilter.py => _mediasidebarfilter.py} |   0
 ...SidebarFilter.py => _notesidebarfilter.py} |   0
 ...debarFilter.py => _personsidebarfilter.py} |   0
 ...idebarFilter.py => _placesidebarfilter.py} |   0
 ...SidebarFilter.py => _reposidebarfilter.py} |   0
 .../{_SidebarFilter.py => _sidebarfilter.py}  |   0
 ...debarFilter.py => _sourcesidebarfilter.py} |   0
 281 files changed, 747 insertions(+), 747 deletions(-)
 rename src/gen/filters/{_FilterList.py => _filterlist.py} (100%)
 rename src/gen/filters/{_FilterParser.py => _filterparser.py} (100%)
 rename src/gen/filters/{_GenericFilter.py => _genericfilter.py} (100%)
 rename src/gen/filters/{_ParamFilter.py => _paramfilter.py} (100%)
 rename src/gen/filters/{_SearchFilter.py => _searchfilter.py} (100%)
 rename src/gen/filters/rules/{_ChangedSinceBase.py => _changedsincebase.py} (100%)
 rename src/gen/filters/rules/{_Everything.py => _everything.py} (100%)
 rename src/gen/filters/rules/{_HasAttributeBase.py => _hasattributebase.py} (100%)
 rename src/gen/filters/rules/{_HasCitationBase.py => _hascitationbase.py} (100%)
 rename src/gen/filters/rules/{_HasEventBase.py => _haseventbase.py} (100%)
 rename src/gen/filters/rules/{_HasGalleryBase.py => _hasgallerybase.py} (100%)
 rename src/gen/filters/rules/{_HasGrampsId.py => _hasgrampsid.py} (100%)
 rename src/gen/filters/rules/{_HasLDSBase.py => _hasldsbase.py} (100%)
 rename src/gen/filters/rules/{_HasNoteBase.py => _hasnotebase.py} (100%)
 rename src/gen/filters/rules/{_HasNoteRegexBase.py => _hasnoteregexbase.py} (100%)
 rename src/gen/filters/rules/{_HasNoteSubstrBase.py => _hasnotesubstrbase.py} (100%)
 rename src/gen/filters/rules/{_HasReferenceCountBase.py => _hasreferencecountbase.py} (100%)
 rename src/gen/filters/rules/{_HasSourceBase.py => _hassourcebase.py} (100%)
 rename src/gen/filters/rules/{_HasSourceCountBase.py => _hassourcecountbase.py} (100%)
 rename src/gen/filters/rules/{_HasTagBase.py => _hastagbase.py} (100%)
 rename src/gen/filters/rules/{_HasTextMatchingRegexpOf.py => _hastextmatchingregexpof.py} (100%)
 rename src/gen/filters/rules/{_HasTextMatchingSubstringOf.py => _hastextmatchingsubstringof.py} (100%)
 rename src/gen/filters/rules/{_IsPrivate.py => _isprivate.py} (100%)
 rename src/gen/filters/rules/{_IsPublic.py => _ispublic.py} (100%)
 rename src/gen/filters/rules/{_MatchesEventFilterBase.py => _matcheseventfilterbase.py} (100%)
 rename src/gen/filters/rules/{_MatchesFilterBase.py => _matchesfilterbase.py} (100%)
 rename src/gen/filters/rules/{_MatchesSourceConfidenceBase.py => _matchessourceconfidencebase.py} (100%)
 rename src/gen/filters/rules/{_MatchesSourceFilterBase.py => _matchessourcefilterbase.py} (100%)
 rename src/gen/filters/rules/{_RegExpIdBase.py => _regexpidbase.py} (100%)
 rename src/gen/filters/rules/{_Rule.py => _rule.py} (100%)
 rename src/gen/filters/rules/citation/{_AllCitations.py => _allcitations.py} (100%)
 rename src/gen/filters/rules/citation/{_ChangedSince.py => _changedsince.py} (100%)
 rename src/gen/filters/rules/citation/{_CitationPrivate.py => _citationprivate.py} (100%)
 rename src/gen/filters/rules/citation/{_HasGallery.py => _hasgallery.py} (100%)
 rename src/gen/filters/rules/citation/{_HasIdOf.py => _hasidof.py} (100%)
 rename src/gen/filters/rules/citation/{_HasNote.py => _hasnote.py} (100%)
 rename src/gen/filters/rules/citation/{_HasNoteMatchingSubstringOf.py => _hasnotematchingsubstringof.py} (100%)
 rename src/gen/filters/rules/citation/{_HasNoteRegexp.py => _hasnoteregexp.py} (100%)
 rename src/gen/filters/rules/citation/{_HasReferenceCountOf.py => _hasreferencecountof.py} (100%)
 rename src/gen/filters/rules/citation/{_HasSource.py => _hassource.py} (100%)
 rename src/gen/filters/rules/citation/{_MatchesFilter.py => _matchesfilter.py} (100%)
 rename src/gen/filters/rules/citation/{_MatchesPageSubstringOf.py => _matchespagesubstringof.py} (100%)
 rename src/gen/filters/rules/citation/{_MatchesRepositoryFilter.py => _matchesrepositoryfilter.py} (100%)
 rename src/gen/filters/rules/citation/{_MatchesSourceFilter.py => _matchessourcefilter.py} (100%)
 rename src/gen/filters/rules/citation/{_RegExpIdOf.py => _regexpidof.py} (100%)
 rename src/gen/filters/rules/event/{_AllEvents.py => _allevents.py} (100%)
 rename src/gen/filters/rules/event/{_ChangedSince.py => _changedsince.py} (100%)
 rename src/gen/filters/rules/event/{_EventPrivate.py => _eventprivate.py} (100%)
 rename src/gen/filters/rules/event/{_HasAttribute.py => _hasattribute.py} (100%)
 rename src/gen/filters/rules/event/{_HasCitation.py => _hascitation.py} (100%)
 rename src/gen/filters/rules/event/{_HasData.py => _hasdata.py} (100%)
 rename src/gen/filters/rules/event/{_HasGallery.py => _hasgallery.py} (100%)
 rename src/gen/filters/rules/event/{_HasIdOf.py => _hasidof.py} (100%)
 rename src/gen/filters/rules/event/{_HasNote.py => _hasnote.py} (100%)
 rename src/gen/filters/rules/event/{_HasNoteMatchingSubstringOf.py => _hasnotematchingsubstringof.py} (100%)
 rename src/gen/filters/rules/event/{_HasNoteRegexp.py => _hasnoteregexp.py} (100%)
 rename src/gen/filters/rules/event/{_HasReferenceCountOf.py => _hasreferencecountof.py} (100%)
 rename src/gen/filters/rules/event/{_HasSourceCount.py => _hassourcecount.py} (100%)
 rename src/gen/filters/rules/event/{_HasType.py => _hastype.py} (100%)
 rename src/gen/filters/rules/event/{_MatchesFilter.py => _matchesfilter.py} (100%)
 rename src/gen/filters/rules/event/{_MatchesPersonFilter.py => _matchespersonfilter.py} (100%)
 rename src/gen/filters/rules/event/{_MatchesSourceConfidence.py => _matchessourceconfidence.py} (100%)
 rename src/gen/filters/rules/event/{_MatchesSourceFilter.py => _matchessourcefilter.py} (100%)
 rename src/gen/filters/rules/event/{_RegExpIdOf.py => _regexpidof.py} (100%)
 rename src/gen/filters/rules/family/{_AllFamilies.py => _allfamilies.py} (100%)
 rename src/gen/filters/rules/family/{_ChangedSince.py => _changedsince.py} (100%)
 rename src/gen/filters/rules/family/{_ChildHasIdOf.py => _childhasidof.py} (100%)
 rename src/gen/filters/rules/family/{_ChildHasNameOf.py => _childhasnameof.py} (100%)
 rename src/gen/filters/rules/family/{_FamilyPrivate.py => _familyprivate.py} (100%)
 rename src/gen/filters/rules/family/{_FatherHasIdOf.py => _fatherhasidof.py} (100%)
 rename src/gen/filters/rules/family/{_FatherHasNameOf.py => _fatherhasnameof.py} (100%)
 rename src/gen/filters/rules/family/{_HasAttribute.py => _hasattribute.py} (100%)
 rename src/gen/filters/rules/family/{_HasCitation.py => _hascitation.py} (100%)
 rename src/gen/filters/rules/family/{_HasEvent.py => _hasevent.py} (100%)
 rename src/gen/filters/rules/family/{_HasGallery.py => _hasgallery.py} (100%)
 rename src/gen/filters/rules/family/{_HasIdOf.py => _hasidof.py} (100%)
 rename src/gen/filters/rules/family/{_HasLDS.py => _haslds.py} (100%)
 rename src/gen/filters/rules/family/{_HasNote.py => _hasnote.py} (100%)
 rename src/gen/filters/rules/family/{_HasNoteMatchingSubstringOf.py => _hasnotematchingsubstringof.py} (100%)
 rename src/gen/filters/rules/family/{_HasNoteRegexp.py => _hasnoteregexp.py} (100%)
 rename src/gen/filters/rules/family/{_HasReferenceCountOf.py => _hasreferencecountof.py} (100%)
 rename src/gen/filters/rules/family/{_HasRelType.py => _hasreltype.py} (100%)
 rename src/gen/filters/rules/family/{_HasSourceCount.py => _hassourcecount.py} (100%)
 rename src/gen/filters/rules/family/{_HasTag.py => _hastag.py} (100%)
 rename src/gen/filters/rules/family/{_IsBookmarked.py => _isbookmarked.py} (100%)
 rename src/gen/filters/rules/family/{_MatchesFilter.py => _matchesfilter.py} (100%)
 rename src/gen/filters/rules/family/{_MatchesSourceConfidence.py => _matchessourceconfidence.py} (100%)
 rename src/gen/filters/rules/family/{_MemberBase.py => _memberbase.py} (100%)
 rename src/gen/filters/rules/family/{_MotherHasIdOf.py => _motherhasidof.py} (100%)
 rename src/gen/filters/rules/family/{_MotherHasNameOf.py => _motherhasnameof.py} (100%)
 rename src/gen/filters/rules/family/{_RegExpChildName.py => _regexpchildname.py} (100%)
 rename src/gen/filters/rules/family/{_RegExpFatherName.py => _regexpfathername.py} (100%)
 rename src/gen/filters/rules/family/{_RegExpIdOf.py => _regexpidof.py} (100%)
 rename src/gen/filters/rules/family/{_RegExpMotherName.py => _regexpmothername.py} (100%)
 rename src/gen/filters/rules/family/{_SearchChildName.py => _searchchildname.py} (100%)
 rename src/gen/filters/rules/family/{_SearchFatherName.py => _searchfathername.py} (100%)
 rename src/gen/filters/rules/family/{_SearchMotherName.py => _searchmothername.py} (100%)
 rename src/gen/filters/rules/media/{_AllMedia.py => _allmedia.py} (100%)
 rename src/gen/filters/rules/media/{_ChangedSince.py => _changedsince.py} (100%)
 rename src/gen/filters/rules/media/{_HasAttribute.py => _hasattribute.py} (100%)
 rename src/gen/filters/rules/media/{_HasIdOf.py => _hasidof.py} (100%)
 rename src/gen/filters/rules/media/{_HasMedia.py => _hasmedia.py} (100%)
 rename src/gen/filters/rules/media/{_HasNoteMatchingSubstringOf.py => _hasnotematchingsubstringof.py} (100%)
 rename src/gen/filters/rules/media/{_HasNoteRegexp.py => _hasnoteregexp.py} (100%)
 rename src/gen/filters/rules/media/{_HasReferenceCountOf.py => _hasreferencecountof.py} (100%)
 rename src/gen/filters/rules/media/{_HasTag.py => _hastag.py} (100%)
 rename src/gen/filters/rules/media/{_MatchesFilter.py => _matchesfilter.py} (100%)
 rename src/gen/filters/rules/media/{_MediaPrivate.py => _mediaprivate.py} (100%)
 rename src/gen/filters/rules/media/{_RegExpIdOf.py => _regexpidof.py} (100%)
 rename src/gen/filters/rules/note/{_AllNotes.py => _allnotes.py} (100%)
 rename src/gen/filters/rules/note/{_ChangedSince.py => _changedsince.py} (100%)
 rename src/gen/filters/rules/note/{_HasIdOf.py => _hasidof.py} (100%)
 rename src/gen/filters/rules/note/{_HasNote.py => _hasnote.py} (100%)
 rename src/gen/filters/rules/note/{_HasReferenceCountOf.py => _hasreferencecountof.py} (100%)
 rename src/gen/filters/rules/note/{_HasTag.py => _hastag.py} (100%)
 rename src/gen/filters/rules/note/{_MatchesFilter.py => _matchesfilter.py} (100%)
 rename src/gen/filters/rules/note/{_MatchesRegexpOf.py => _matchesregexpof.py} (100%)
 rename src/gen/filters/rules/note/{_MatchesSubstringOf.py => _matchessubstringof.py} (100%)
 rename src/gen/filters/rules/note/{_NotePrivate.py => _noteprivate.py} (100%)
 rename src/gen/filters/rules/note/{_RegExpIdOf.py => _regexpidof.py} (100%)
 rename src/gen/filters/rules/person/{_ChangedSince.py => _changedsince.py} (100%)
 rename src/gen/filters/rules/person/{_DeepRelationshipPathBetween.py => _deeprelationshippathbetween.py} (100%)
 rename src/gen/filters/rules/person/{_Disconnected.py => _disconnected.py} (100%)
 rename src/gen/filters/rules/person/{_Everyone.py => _everyone.py} (100%)
 rename src/gen/filters/rules/person/{_FamilyWithIncompleteEvent.py => _familywithincompleteevent.py} (100%)
 rename src/gen/filters/rules/person/{_HasAddress.py => _hasaddress.py} (100%)
 rename src/gen/filters/rules/person/{_HasAlternateName.py => _hasalternatename.py} (100%)
 rename src/gen/filters/rules/person/{_HasAssociation.py => _hasassociation.py} (100%)
 rename src/gen/filters/rules/person/{_HasAttribute.py => _hasattribute.py} (100%)
 rename src/gen/filters/rules/person/{_HasBirth.py => _hasbirth.py} (100%)
 rename src/gen/filters/rules/person/{_HasCitation.py => _hascitation.py} (100%)
 rename src/gen/filters/rules/person/{_HasCommonAncestorWith.py => _hascommonancestorwith.py} (100%)
 rename src/gen/filters/rules/person/{_HasCommonAncestorWithFilterMatch.py => _hascommonancestorwithfiltermatch.py} (100%)
 rename src/gen/filters/rules/person/{_HasDeath.py => _hasdeath.py} (100%)
 rename src/gen/filters/rules/person/{_HasEvent.py => _hasevent.py} (100%)
 rename src/gen/filters/rules/person/{_HasFamilyAttribute.py => _hasfamilyattribute.py} (100%)
 rename src/gen/filters/rules/person/{_HasFamilyEvent.py => _hasfamilyevent.py} (100%)
 rename src/gen/filters/rules/person/{_HasGallery.py => _hasgallery.py} (100%)
 rename src/gen/filters/rules/person/{_HasIdOf.py => _hasidof.py} (100%)
 rename src/gen/filters/rules/person/{_HasLDS.py => _haslds.py} (100%)
 rename src/gen/filters/rules/person/{_HasNameOf.py => _hasnameof.py} (100%)
 rename src/gen/filters/rules/person/{_HasNameOriginType.py => _hasnameorigintype.py} (100%)
 rename src/gen/filters/rules/person/{_HasNameType.py => _hasnametype.py} (100%)
 rename src/gen/filters/rules/person/{_HasNickname.py => _hasnickname.py} (100%)
 rename src/gen/filters/rules/person/{_HasNote.py => _hasnote.py} (100%)
 rename src/gen/filters/rules/person/{_HasNoteMatchingSubstringOf.py => _hasnotematchingsubstringof.py} (100%)
 rename src/gen/filters/rules/person/{_HasNoteRegexp.py => _hasnoteregexp.py} (100%)
 rename src/gen/filters/rules/person/{_HasRelationship.py => _hasrelationship.py} (100%)
 rename src/gen/filters/rules/person/{_HasSourceCount.py => _hassourcecount.py} (100%)
 rename src/gen/filters/rules/person/{_HasSourceOf.py => _hassourceof.py} (100%)
 rename src/gen/filters/rules/person/{_HasTag.py => _hastag.py} (100%)
 rename src/gen/filters/rules/person/{_HasTextMatchingRegexpOf.py => _hastextmatchingregexpof.py} (100%)
 rename src/gen/filters/rules/person/{_HasTextMatchingSubstringOf.py => _hastextmatchingsubstringof.py} (100%)
 rename src/gen/filters/rules/person/{_HasUnknownGender.py => _hasunknowngender.py} (100%)
 rename src/gen/filters/rules/person/{_HaveAltFamilies.py => _havealtfamilies.py} (100%)
 rename src/gen/filters/rules/person/{_HaveChildren.py => _havechildren.py} (100%)
 rename src/gen/filters/rules/person/{_IncompleteNames.py => _incompletenames.py} (100%)
 rename src/gen/filters/rules/person/{_IsAncestorOf.py => _isancestorof.py} (100%)
 rename src/gen/filters/rules/person/{_IsAncestorOfFilterMatch.py => _isancestoroffiltermatch.py} (100%)
 rename src/gen/filters/rules/person/{_IsBookmarked.py => _isbookmarked.py} (100%)
 rename src/gen/filters/rules/person/{_IsChildOfFilterMatch.py => _ischildoffiltermatch.py} (100%)
 rename src/gen/filters/rules/person/{_IsDefaultPerson.py => _isdefaultperson.py} (100%)
 rename src/gen/filters/rules/person/{_IsDescendantFamilyOf.py => _isdescendantfamilyof.py} (100%)
 rename src/gen/filters/rules/person/{_IsDescendantFamilyOfFilterMatch.py => _isdescendantfamilyoffiltermatch.py} (100%)
 rename src/gen/filters/rules/person/{_IsDescendantOf.py => _isdescendantof.py} (100%)
 rename src/gen/filters/rules/person/{_IsDescendantOfFilterMatch.py => _isdescendantoffiltermatch.py} (100%)
 rename src/gen/filters/rules/person/{_IsDuplicatedAncestorOf.py => _isduplicatedancestorof.py} (100%)
 rename src/gen/filters/rules/person/{_IsFemale.py => _isfemale.py} (100%)
 rename src/gen/filters/rules/person/{_IsLessThanNthGenerationAncestorOf.py => _islessthannthgenerationancestorof.py} (100%)
 rename src/gen/filters/rules/person/{_IsLessThanNthGenerationAncestorOfBookmarked.py => _islessthannthgenerationancestorofbookmarked.py} (100%)
 rename src/gen/filters/rules/person/{_IsLessThanNthGenerationAncestorOfDefaultPerson.py => _islessthannthgenerationancestorofdefaultperson.py} (100%)
 rename src/gen/filters/rules/person/{_IsLessThanNthGenerationDescendantOf.py => _islessthannthgenerationdescendantof.py} (100%)
 rename src/gen/filters/rules/person/{_IsMale.py => _ismale.py} (100%)
 rename src/gen/filters/rules/person/{_IsMoreThanNthGenerationAncestorOf.py => _ismorethannthgenerationancestorof.py} (100%)
 rename src/gen/filters/rules/person/{_IsMoreThanNthGenerationDescendantOf.py => _ismorethannthgenerationdescendantof.py} (100%)
 rename src/gen/filters/rules/person/{_IsParentOfFilterMatch.py => _isparentoffiltermatch.py} (100%)
 rename src/gen/filters/rules/person/{_IsRelatedWith.py => _isrelatedwith.py} (100%)
 rename src/gen/filters/rules/person/{_IsSiblingOfFilterMatch.py => _issiblingoffiltermatch.py} (100%)
 rename src/gen/filters/rules/person/{_IsSpouseOfFilterMatch.py => _isspouseoffiltermatch.py} (100%)
 rename src/gen/filters/rules/person/{_IsWitness.py => _iswitness.py} (100%)
 rename src/gen/filters/rules/person/{_MatchesEventFilter.py => _matcheseventfilter.py} (100%)
 rename src/gen/filters/rules/person/{_MatchesFilter.py => _matchesfilter.py} (100%)
 rename src/gen/filters/rules/person/{_MatchesSourceConfidence.py => _matchessourceconfidence.py} (100%)
 rename src/gen/filters/rules/person/{_MatchIdOf.py => _matchidof.py} (100%)
 rename src/gen/filters/rules/person/{_MissingParent.py => _missingparent.py} (100%)
 rename src/gen/filters/rules/person/{_MultipleMarriages.py => _multiplemarriages.py} (100%)
 rename src/gen/filters/rules/person/{_NeverMarried.py => _nevermarried.py} (100%)
 rename src/gen/filters/rules/person/{_NoBirthdate.py => _nobirthdate.py} (100%)
 rename src/gen/filters/rules/person/{_NoDeathdate.py => _nodeathdate.py} (100%)
 rename src/gen/filters/rules/person/{_PeoplePrivate.py => _peopleprivate.py} (100%)
 rename src/gen/filters/rules/person/{_PeoplePublic.py => _peoplepublic.py} (100%)
 rename src/gen/filters/rules/person/{_PersonWithIncompleteEvent.py => _personwithincompleteevent.py} (100%)
 rename src/gen/filters/rules/person/{_ProbablyAlive.py => _probablyalive.py} (100%)
 rename src/gen/filters/rules/person/{_RegExpIdOf.py => _regexpidof.py} (100%)
 rename src/gen/filters/rules/person/{_RegExpName.py => _regexpname.py} (100%)
 rename src/gen/filters/rules/person/{_RelationshipPathBetween.py => _relationshippathbetween.py} (100%)
 rename src/gen/filters/rules/person/{_RelationshipPathBetweenBookmarks.py => _relationshippathbetweenbookmarks.py} (100%)
 rename src/gen/filters/rules/person/{_SearchName.py => _searchname.py} (100%)
 rename src/gen/filters/rules/place/{_AllPlaces.py => _allplaces.py} (100%)
 rename src/gen/filters/rules/place/{_ChangedSince.py => _changedsince.py} (100%)
 rename src/gen/filters/rules/place/{_HasGallery.py => _hasgallery.py} (100%)
 rename src/gen/filters/rules/place/{_HasIdOf.py => _hasidof.py} (100%)
 rename src/gen/filters/rules/place/{_HasNoLatOrLon.py => _hasnolatorlon.py} (100%)
 rename src/gen/filters/rules/place/{_HasNote.py => _hasnote.py} (100%)
 rename src/gen/filters/rules/place/{_HasNoteMatchingSubstringOf.py => _hasnotematchingsubstringof.py} (100%)
 rename src/gen/filters/rules/place/{_HasNoteRegexp.py => _hasnoteregexp.py} (100%)
 rename src/gen/filters/rules/place/{_HasPlace.py => _hasplace.py} (100%)
 rename src/gen/filters/rules/place/{_HasReferenceCountOf.py => _hasreferencecountof.py} (100%)
 rename src/gen/filters/rules/place/{_InLatLonNeighborhood.py => _inlatlonneighborhood.py} (100%)
 rename src/gen/filters/rules/place/{_MatchesEventFilter.py => _matcheseventfilter.py} (100%)
 rename src/gen/filters/rules/place/{_MatchesFilter.py => _matchesfilter.py} (100%)
 rename src/gen/filters/rules/place/{_PlacePrivate.py => _placeprivate.py} (100%)
 rename src/gen/filters/rules/place/{_RegExpIdOf.py => _regexpidof.py} (100%)
 rename src/gen/filters/rules/repository/{_AllRepos.py => _allrepos.py} (100%)
 rename src/gen/filters/rules/repository/{_ChangedSince.py => _changedsince.py} (100%)
 rename src/gen/filters/rules/repository/{_HasIdOf.py => _hasidof.py} (100%)
 rename src/gen/filters/rules/repository/{_HasNoteMatchingSubstringOf.py => _hasnotematchingsubstringof.py} (100%)
 rename src/gen/filters/rules/repository/{_HasNoteRegexp.py => _hasnoteregexp.py} (100%)
 rename src/gen/filters/rules/repository/{_HasReferenceCountOf.py => _hasreferencecountof.py} (100%)
 rename src/gen/filters/rules/repository/{_HasRepo.py => _hasrepo.py} (100%)
 rename src/gen/filters/rules/repository/{_MatchesFilter.py => _matchesfilter.py} (100%)
 rename src/gen/filters/rules/repository/{_MatchesNameSubstringOf.py => _matchesnamesubstringof.py} (100%)
 rename src/gen/filters/rules/repository/{_RegExpIdOf.py => _regexpidof.py} (100%)
 rename src/gen/filters/rules/repository/{_RepoPrivate.py => _repoprivate.py} (100%)
 rename src/gen/filters/rules/source/{_AllSources.py => _allsources.py} (100%)
 rename src/gen/filters/rules/source/{_ChangedSince.py => _changedsince.py} (100%)
 rename src/gen/filters/rules/source/{_HasGallery.py => _hasgallery.py} (100%)
 rename src/gen/filters/rules/source/{_HasIdOf.py => _hasidof.py} (100%)
 rename src/gen/filters/rules/source/{_HasNote.py => _hasnote.py} (100%)
 rename src/gen/filters/rules/source/{_HasNoteMatchingSubstringOf.py => _hasnotematchingsubstringof.py} (100%)
 rename src/gen/filters/rules/source/{_HasNoteRegexp.py => _hasnoteregexp.py} (100%)
 rename src/gen/filters/rules/source/{_HasReferenceCountOf.py => _hasreferencecountof.py} (100%)
 rename src/gen/filters/rules/source/{_HasRepository.py => _hasrepository.py} (100%)
 rename src/gen/filters/rules/source/{_HasRepositoryCallNumberRef.py => _hasrepositorycallnumberref.py} (100%)
 rename src/gen/filters/rules/source/{_MatchesFilter.py => _matchesfilter.py} (100%)
 rename src/gen/filters/rules/source/{_MatchesRepositoryFilter.py => _matchesrepositoryfilter.py} (100%)
 rename src/gen/filters/rules/source/{_MatchesTitleSubstringOf.py => _matchestitlesubstringof.py} (100%)
 rename src/gen/filters/rules/source/{_RegExpIdOf.py => _regexpidof.py} (100%)
 rename src/gen/filters/rules/source/{_SourcePrivate.py => _sourceprivate.py} (100%)
 rename src/gui/filters/{_FilterComboBox.py => _filtercombobox.py} (100%)
 rename src/gui/filters/{_FilterMenu.py => _filtermenu.py} (100%)
 rename src/gui/filters/{_FilterStore.py => _filterstore.py} (100%)
 rename src/gui/filters/{_SearchBar.py => _searchbar.py} (100%)
 rename src/gui/filters/sidebar/{_CitationSidebarFilter.py => _citationsidebarfilter.py} (100%)
 rename src/gui/filters/sidebar/{_EventSidebarFilter.py => _eventsidebarfilter.py} (100%)
 rename src/gui/filters/sidebar/{_FamilySidebarFilter.py => _familysidebarfilter.py} (100%)
 rename src/gui/filters/sidebar/{_MediaSidebarFilter.py => _mediasidebarfilter.py} (100%)
 rename src/gui/filters/sidebar/{_NoteSidebarFilter.py => _notesidebarfilter.py} (100%)
 rename src/gui/filters/sidebar/{_PersonSidebarFilter.py => _personsidebarfilter.py} (100%)
 rename src/gui/filters/sidebar/{_PlaceSidebarFilter.py => _placesidebarfilter.py} (100%)
 rename src/gui/filters/sidebar/{_RepoSidebarFilter.py => _reposidebarfilter.py} (100%)
 rename src/gui/filters/sidebar/{_SidebarFilter.py => _sidebarfilter.py} (100%)
 rename src/gui/filters/sidebar/{_SourceSidebarFilter.py => _sourcesidebarfilter.py} (100%)

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 4766a15e9..d51ab6a13 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -41,239 +41,239 @@ src/gen/db/upgrade.py
 src/gen/display/name.py
 
 # gen.filters package
-src/gen/filters/_FilterParser.py
+src/gen/filters/_filterparser.py
 
 # gen.filters.rules package
-src/gen/filters/rules/_Everything.py
-src/gen/filters/rules/_HasGrampsId.py
-src/gen/filters/rules/_HasTextMatchingSubstringOf.py
-src/gen/filters/rules/_IsPrivate.py
-src/gen/filters/rules/_Rule.py
+src/gen/filters/rules/_everything.py
+src/gen/filters/rules/_hasgrampsid.py
+src/gen/filters/rules/_hastextmatchingsubstringof.py
+src/gen/filters/rules/_isprivate.py
+src/gen/filters/rules/_rule.py
 
 # gen.filters.rules.person package
-src/gen/filters/rules/person/_ChangedSince.py
-src/gen/filters/rules/person/_DeepRelationshipPathBetween.py
-src/gen/filters/rules/person/_Disconnected.py
-src/gen/filters/rules/person/_Everyone.py
-src/gen/filters/rules/person/_FamilyWithIncompleteEvent.py
-src/gen/filters/rules/person/_HasAddress.py
-src/gen/filters/rules/person/_HasAlternateName.py
-src/gen/filters/rules/person/_HasAssociation.py
-src/gen/filters/rules/person/_HasAttribute.py
-src/gen/filters/rules/person/_HasBirth.py
-src/gen/filters/rules/person/_HasCitation.py
-src/gen/filters/rules/person/_HasCommonAncestorWithFilterMatch.py
-src/gen/filters/rules/person/_HasCommonAncestorWith.py
-src/gen/filters/rules/person/_HasDeath.py
-src/gen/filters/rules/person/_HasEvent.py
-src/gen/filters/rules/person/_HasFamilyAttribute.py
-src/gen/filters/rules/person/_HasFamilyEvent.py
-src/gen/filters/rules/person/_HasGallery.py
-src/gen/filters/rules/person/_HasIdOf.py
-src/gen/filters/rules/person/_HasLDS.py
-src/gen/filters/rules/person/_HasNameOf.py
-src/gen/filters/rules/person/_HasNameOriginType.py
-src/gen/filters/rules/person/_HasNameType.py
-src/gen/filters/rules/person/_HasNickname.py
-src/gen/filters/rules/person/_HasNote.py
-src/gen/filters/rules/person/_HasNoteMatchingSubstringOf.py
-src/gen/filters/rules/person/_HasNoteRegexp.py
-src/gen/filters/rules/person/_HasRelationship.py
-src/gen/filters/rules/person/_HasSourceCount.py
-src/gen/filters/rules/person/_HasSourceOf.py
-src/gen/filters/rules/person/_HasTag.py
-src/gen/filters/rules/person/_HasTextMatchingSubstringOf.py
-src/gen/filters/rules/person/_HasUnknownGender.py
-src/gen/filters/rules/person/_HaveAltFamilies.py
-src/gen/filters/rules/person/_HaveChildren.py
-src/gen/filters/rules/person/_IncompleteNames.py
-src/gen/filters/rules/person/_IsAncestorOfFilterMatch.py
-src/gen/filters/rules/person/_IsAncestorOf.py
-src/gen/filters/rules/person/_IsBookmarked.py
-src/gen/filters/rules/person/_IsChildOfFilterMatch.py
-src/gen/filters/rules/person/_IsDescendantFamilyOfFilterMatch.py
-src/gen/filters/rules/person/_IsDefaultPerson.py
-src/gen/filters/rules/person/_IsDescendantFamilyOf.py
-src/gen/filters/rules/person/_IsDescendantOfFilterMatch.py
-src/gen/filters/rules/person/_IsDescendantOf.py
-src/gen/filters/rules/person/_IsDuplicatedAncestorOf.py
-src/gen/filters/rules/person/_IsFemale.py
-src/gen/filters/rules/person/_IsLessThanNthGenerationAncestorOfBookmarked.py
-src/gen/filters/rules/person/_IsLessThanNthGenerationAncestorOfDefaultPerson.py
-src/gen/filters/rules/person/_IsLessThanNthGenerationAncestorOf.py
-src/gen/filters/rules/person/_IsLessThanNthGenerationDescendantOf.py
-src/gen/filters/rules/person/_IsMale.py
-src/gen/filters/rules/person/_IsMoreThanNthGenerationAncestorOf.py
-src/gen/filters/rules/person/_IsMoreThanNthGenerationDescendantOf.py
-src/gen/filters/rules/person/_IsParentOfFilterMatch.py
-src/gen/filters/rules/person/_PeoplePublic.py
-src/gen/filters/rules/person/_IsRelatedWith.py
-src/gen/filters/rules/person/_IsSiblingOfFilterMatch.py
-src/gen/filters/rules/person/_IsSpouseOfFilterMatch.py
-src/gen/filters/rules/person/_IsWitness.py
-src/gen/filters/rules/person/_MatchesEventFilter.py
-src/gen/filters/rules/person/_MatchesFilter.py
-src/gen/filters/rules/person/_MatchesSourceConfidence.py
-src/gen/filters/rules/person/_MatchIdOf.py
-src/gen/filters/rules/person/_MissingParent.py
-src/gen/filters/rules/person/_MultipleMarriages.py
-src/gen/filters/rules/person/_NeverMarried.py
-src/gen/filters/rules/person/_NoBirthdate.py
-src/gen/filters/rules/person/_NoDeathdate.py
-src/gen/filters/rules/person/_PeoplePrivate.py
-src/gen/filters/rules/person/_PersonWithIncompleteEvent.py
-src/gen/filters/rules/person/_ProbablyAlive.py
-src/gen/filters/rules/person/_RegExpIdOf.py
-src/gen/filters/rules/person/_RegExpName.py
-src/gen/filters/rules/person/_RelationshipPathBetween.py
-src/gen/filters/rules/person/_RelationshipPathBetweenBookmarks.py
-src/gen/filters/rules/person/_SearchName.py
+src/gen/filters/rules/person/_changedsince.py
+src/gen/filters/rules/person/_deeprelationshippathbetween.py
+src/gen/filters/rules/person/_disconnected.py
+src/gen/filters/rules/person/_everyone.py
+src/gen/filters/rules/person/_familywithincompleteevent.py
+src/gen/filters/rules/person/_hasaddress.py
+src/gen/filters/rules/person/_hasalternatename.py
+src/gen/filters/rules/person/_hasassociation.py
+src/gen/filters/rules/person/_hasattribute.py
+src/gen/filters/rules/person/_hasbirth.py
+src/gen/filters/rules/person/_hascitation.py
+src/gen/filters/rules/person/_hascommonancestorwithfiltermatch.py
+src/gen/filters/rules/person/_hascommonancestorwith.py
+src/gen/filters/rules/person/_hasdeath.py
+src/gen/filters/rules/person/_hasevent.py
+src/gen/filters/rules/person/_hasfamilyattribute.py
+src/gen/filters/rules/person/_hasfamilyevent.py
+src/gen/filters/rules/person/_hasgallery.py
+src/gen/filters/rules/person/_hasidof.py
+src/gen/filters/rules/person/_haslds.py
+src/gen/filters/rules/person/_hasnameof.py
+src/gen/filters/rules/person/_hasnameorigintype.py
+src/gen/filters/rules/person/_hasnametype.py
+src/gen/filters/rules/person/_hasnickname.py
+src/gen/filters/rules/person/_hasnote.py
+src/gen/filters/rules/person/_hasnotematchingsubstringof.py
+src/gen/filters/rules/person/_hasnoteregexp.py
+src/gen/filters/rules/person/_hasrelationship.py
+src/gen/filters/rules/person/_hassourcecount.py
+src/gen/filters/rules/person/_hassourceof.py
+src/gen/filters/rules/person/_hastag.py
+src/gen/filters/rules/person/_hastextmatchingsubstringof.py
+src/gen/filters/rules/person/_hasunknowngender.py
+src/gen/filters/rules/person/_havealtfamilies.py
+src/gen/filters/rules/person/_havechildren.py
+src/gen/filters/rules/person/_incompletenames.py
+src/gen/filters/rules/person/_isancestoroffiltermatch.py
+src/gen/filters/rules/person/_isancestorof.py
+src/gen/filters/rules/person/_isbookmarked.py
+src/gen/filters/rules/person/_ischildoffiltermatch.py
+src/gen/filters/rules/person/_isdescendantfamilyoffiltermatch.py
+src/gen/filters/rules/person/_isdefaultperson.py
+src/gen/filters/rules/person/_isdescendantfamilyof.py
+src/gen/filters/rules/person/_isdescendantoffiltermatch.py
+src/gen/filters/rules/person/_isdescendantof.py
+src/gen/filters/rules/person/_isduplicatedancestorof.py
+src/gen/filters/rules/person/_isfemale.py
+src/gen/filters/rules/person/_islessthannthgenerationancestorofbookmarked.py
+src/gen/filters/rules/person/_islessthannthgenerationancestorofdefaultperson.py
+src/gen/filters/rules/person/_islessthannthgenerationancestorof.py
+src/gen/filters/rules/person/_islessthannthgenerationdescendantof.py
+src/gen/filters/rules/person/_ismale.py
+src/gen/filters/rules/person/_ismorethannthgenerationancestorof.py
+src/gen/filters/rules/person/_ismorethannthgenerationdescendantof.py
+src/gen/filters/rules/person/_isparentoffiltermatch.py
+src/gen/filters/rules/person/_peoplepublic.py
+src/gen/filters/rules/person/_isrelatedwith.py
+src/gen/filters/rules/person/_issiblingoffiltermatch.py
+src/gen/filters/rules/person/_isspouseoffiltermatch.py
+src/gen/filters/rules/person/_iswitness.py
+src/gen/filters/rules/person/_matcheseventfilter.py
+src/gen/filters/rules/person/_matchesfilter.py
+src/gen/filters/rules/person/_matchessourceconfidence.py
+src/gen/filters/rules/person/_matchidof.py
+src/gen/filters/rules/person/_missingparent.py
+src/gen/filters/rules/person/_multiplemarriages.py
+src/gen/filters/rules/person/_nevermarried.py
+src/gen/filters/rules/person/_nobirthdate.py
+src/gen/filters/rules/person/_nodeathdate.py
+src/gen/filters/rules/person/_peopleprivate.py
+src/gen/filters/rules/person/_personwithincompleteevent.py
+src/gen/filters/rules/person/_probablyalive.py
+src/gen/filters/rules/person/_regexpidof.py
+src/gen/filters/rules/person/_regexpname.py
+src/gen/filters/rules/person/_relationshippathbetween.py
+src/gen/filters/rules/person/_relationshippathbetweenbookmarks.py
+src/gen/filters/rules/person/_searchname.py
 
 # gen.filters.rules.family package
-src/gen/filters/rules/family/_AllFamilies.py
-src/gen/filters/rules/family/_ChangedSince.py
-src/gen/filters/rules/family/_ChildHasIdOf.py
-src/gen/filters/rules/family/_ChildHasNameOf.py
-src/gen/filters/rules/family/_FamilyPrivate.py
-src/gen/filters/rules/family/_FatherHasIdOf.py
-src/gen/filters/rules/family/_FatherHasNameOf.py
-src/gen/filters/rules/family/_HasAttribute.py
-src/gen/filters/rules/family/_HasCitation.py
-src/gen/filters/rules/family/_HasEvent.py
-src/gen/filters/rules/family/_HasGallery.py
-src/gen/filters/rules/family/_HasIdOf.py
-src/gen/filters/rules/family/_HasLDS.py
-src/gen/filters/rules/family/_HasNote.py
-src/gen/filters/rules/family/_HasNoteMatchingSubstringOf.py
-src/gen/filters/rules/family/_HasNoteRegexp.py
-src/gen/filters/rules/family/_HasReferenceCountOf.py
-src/gen/filters/rules/family/_HasRelType.py
-src/gen/filters/rules/family/_HasSourceCount.py
-src/gen/filters/rules/family/_HasTag.py
-src/gen/filters/rules/family/_IsBookmarked.py
-src/gen/filters/rules/family/_MatchesFilter.py
-src/gen/filters/rules/family/_MatchesSourceConfidence.py
-src/gen/filters/rules/family/_MotherHasIdOf.py
-src/gen/filters/rules/family/_MotherHasNameOf.py
-src/gen/filters/rules/family/_SearchFatherName.py
-src/gen/filters/rules/family/_SearchChildName.py
-src/gen/filters/rules/family/_SearchMotherName.py
-src/gen/filters/rules/family/_RegExpFatherName.py
-src/gen/filters/rules/family/_RegExpMotherName.py
-src/gen/filters/rules/family/_RegExpChildName.py
-src/gen/filters/rules/family/_RegExpIdOf.py
+src/gen/filters/rules/family/_allfamilies.py
+src/gen/filters/rules/family/_changedsince.py
+src/gen/filters/rules/family/_childhasidof.py
+src/gen/filters/rules/family/_childhasnameof.py
+src/gen/filters/rules/family/_familyprivate.py
+src/gen/filters/rules/family/_fatherhasidof.py
+src/gen/filters/rules/family/_fatherhasnameof.py
+src/gen/filters/rules/family/_hasattribute.py
+src/gen/filters/rules/family/_hascitation.py
+src/gen/filters/rules/family/_hasevent.py
+src/gen/filters/rules/family/_hasgallery.py
+src/gen/filters/rules/family/_hasidof.py
+src/gen/filters/rules/family/_haslds.py
+src/gen/filters/rules/family/_hasnote.py
+src/gen/filters/rules/family/_hasnotematchingsubstringof.py
+src/gen/filters/rules/family/_hasnoteregexp.py
+src/gen/filters/rules/family/_hasreferencecountof.py
+src/gen/filters/rules/family/_hasreltype.py
+src/gen/filters/rules/family/_hassourcecount.py
+src/gen/filters/rules/family/_hastag.py
+src/gen/filters/rules/family/_isbookmarked.py
+src/gen/filters/rules/family/_matchesfilter.py
+src/gen/filters/rules/family/_matchessourceconfidence.py
+src/gen/filters/rules/family/_motherhasidof.py
+src/gen/filters/rules/family/_motherhasnameof.py
+src/gen/filters/rules/family/_searchfathername.py
+src/gen/filters/rules/family/_searchchildname.py
+src/gen/filters/rules/family/_searchmothername.py
+src/gen/filters/rules/family/_regexpfathername.py
+src/gen/filters/rules/family/_regexpmothername.py
+src/gen/filters/rules/family/_regexpchildname.py
+src/gen/filters/rules/family/_regexpidof.py
 
 # gen.filters.rules.event package
-src/gen/filters/rules/event/_AllEvents.py
-src/gen/filters/rules/event/_ChangedSince.py
-src/gen/filters/rules/event/_EventPrivate.py
-src/gen/filters/rules/event/_HasAttribute.py
-src/gen/filters/rules/event/_HasCitation.py
-src/gen/filters/rules/event/_HasData.py
-src/gen/filters/rules/event/_HasGallery.py
-src/gen/filters/rules/event/_HasIdOf.py
-src/gen/filters/rules/event/_HasNote.py
-src/gen/filters/rules/event/_HasNoteMatchingSubstringOf.py
-src/gen/filters/rules/event/_HasNoteRegexp.py
-src/gen/filters/rules/event/_HasReferenceCountOf.py
-src/gen/filters/rules/event/_HasSourceCount.py
-src/gen/filters/rules/event/_HasType.py
-src/gen/filters/rules/event/_MatchesFilter.py
-src/gen/filters/rules/event/_MatchesPersonFilter.py
-src/gen/filters/rules/event/_MatchesSourceFilter.py
-src/gen/filters/rules/event/_MatchesSourceConfidence.py
-src/gen/filters/rules/event/_RegExpIdOf.py
+src/gen/filters/rules/event/_allevents.py
+src/gen/filters/rules/event/_changedsince.py
+src/gen/filters/rules/event/_eventprivate.py
+src/gen/filters/rules/event/_hasattribute.py
+src/gen/filters/rules/event/_hascitation.py
+src/gen/filters/rules/event/_hasdata.py
+src/gen/filters/rules/event/_hasgallery.py
+src/gen/filters/rules/event/_hasidof.py
+src/gen/filters/rules/event/_hasnote.py
+src/gen/filters/rules/event/_hasnotematchingsubstringof.py
+src/gen/filters/rules/event/_hasnoteregexp.py
+src/gen/filters/rules/event/_hasreferencecountof.py
+src/gen/filters/rules/event/_hassourcecount.py
+src/gen/filters/rules/event/_hastype.py
+src/gen/filters/rules/event/_matchesfilter.py
+src/gen/filters/rules/event/_matchespersonfilter.py
+src/gen/filters/rules/event/_matchessourcefilter.py
+src/gen/filters/rules/event/_matchessourceconfidence.py
+src/gen/filters/rules/event/_regexpidof.py
 
 # gen.filters.rules.place package
-src/gen/filters/rules/place/_AllPlaces.py
-src/gen/filters/rules/place/_ChangedSince.py
-src/gen/filters/rules/place/_HasGallery.py
-src/gen/filters/rules/place/_HasIdOf.py
-src/gen/filters/rules/place/_HasNoLatOrLon.py
-src/gen/filters/rules/place/_HasNote.py
-src/gen/filters/rules/place/_HasNoteMatchingSubstringOf.py
-src/gen/filters/rules/place/_HasNoteRegexp.py
-src/gen/filters/rules/place/_HasPlace.py
-src/gen/filters/rules/place/_HasReferenceCountOf.py
-src/gen/filters/rules/place/_InLatLonNeighborhood.py
-src/gen/filters/rules/place/_MatchesFilter.py
-src/gen/filters/rules/place/_MatchesEventFilter.py
-src/gen/filters/rules/place/_PlacePrivate.py
-src/gen/filters/rules/place/_RegExpIdOf.py
+src/gen/filters/rules/place/_allplaces.py
+src/gen/filters/rules/place/_changedsince.py
+src/gen/filters/rules/place/_hasgallery.py
+src/gen/filters/rules/place/_hasidof.py
+src/gen/filters/rules/place/_hasnolatorlon.py
+src/gen/filters/rules/place/_hasnote.py
+src/gen/filters/rules/place/_hasnotematchingsubstringof.py
+src/gen/filters/rules/place/_hasnoteregexp.py
+src/gen/filters/rules/place/_hasplace.py
+src/gen/filters/rules/place/_hasreferencecountof.py
+src/gen/filters/rules/place/_inlatlonneighborhood.py
+src/gen/filters/rules/place/_matchesfilter.py
+src/gen/filters/rules/place/_matcheseventfilter.py
+src/gen/filters/rules/place/_placeprivate.py
+src/gen/filters/rules/place/_regexpidof.py
 
 # gen.filters.rules.source package
-src/gen/filters/rules/source/_AllSources.py
-src/gen/filters/rules/source/_ChangedSince.py
-src/gen/filters/rules/source/_HasGallery.py
-src/gen/filters/rules/source/_HasIdOf.py
-src/gen/filters/rules/source/_HasNote.py
-src/gen/filters/rules/source/_HasNoteRegexp.py
-src/gen/filters/rules/source/_HasNoteMatchingSubstringOf.py
-src/gen/filters/rules/source/_HasReferenceCountOf.py
-src/gen/filters/rules/source/_HasRepository.py
-src/gen/filters/rules/source/_HasRepositoryCallNumberRef.py
-src/gen/filters/rules/source/_MatchesFilter.py
-src/gen/filters/rules/source/_MatchesRepositoryFilter.py
-src/gen/filters/rules/source/_MatchesTitleSubstringOf.py
-src/gen/filters/rules/source/_SourcePrivate.py
-src/gen/filters/rules/source/_RegExpIdOf.py
+src/gen/filters/rules/source/_allsources.py
+src/gen/filters/rules/source/_changedsince.py
+src/gen/filters/rules/source/_hasgallery.py
+src/gen/filters/rules/source/_hasidof.py
+src/gen/filters/rules/source/_hasnote.py
+src/gen/filters/rules/source/_hasnoteregexp.py
+src/gen/filters/rules/source/_hasnotematchingsubstringof.py
+src/gen/filters/rules/source/_hasreferencecountof.py
+src/gen/filters/rules/source/_hasrepository.py
+src/gen/filters/rules/source/_hasrepositorycallnumberref.py
+src/gen/filters/rules/source/_matchesfilter.py
+src/gen/filters/rules/source/_matchesrepositoryfilter.py
+src/gen/filters/rules/source/_matchestitlesubstringof.py
+src/gen/filters/rules/source/_sourceprivate.py
+src/gen/filters/rules/source/_regexpidof.py
 
 # gen.filters.rules.citation package
-src/gen/filters/rules/citation/_AllCitations.py
-src/gen/filters/rules/citation/_ChangedSince.py
-src/gen/filters/rules/citation/_CitationPrivate.py
-src/gen/filters/rules/citation/_HasGallery.py
-src/gen/filters/rules/citation/_HasIdOf.py
-src/gen/filters/rules/citation/_HasNote.py
-src/gen/filters/rules/citation/_HasNoteMatchingSubstringOf.py
-src/gen/filters/rules/citation/_HasNoteRegexp.py
-src/gen/filters/rules/citation/_HasReferenceCountOf.py
-src/gen/filters/rules/citation/_HasSource.py
-src/gen/filters/rules/citation/_MatchesFilter.py
-src/gen/filters/rules/citation/_MatchesPageSubstringOf.py
-src/gen/filters/rules/citation/_RegExpIdOf.py
-src/gen/filters/rules/citation/_MatchesRepositoryFilter.py
-src/gen/filters/rules/citation/_MatchesSourceFilter.py
+src/gen/filters/rules/citation/_allcitations.py
+src/gen/filters/rules/citation/_changedsince.py
+src/gen/filters/rules/citation/_citationprivate.py
+src/gen/filters/rules/citation/_hasgallery.py
+src/gen/filters/rules/citation/_hasidof.py
+src/gen/filters/rules/citation/_hasnote.py
+src/gen/filters/rules/citation/_hasnotematchingsubstringof.py
+src/gen/filters/rules/citation/_hasnoteregexp.py
+src/gen/filters/rules/citation/_hasreferencecountof.py
+src/gen/filters/rules/citation/_hassource.py
+src/gen/filters/rules/citation/_matchesfilter.py
+src/gen/filters/rules/citation/_matchespagesubstringof.py
+src/gen/filters/rules/citation/_regexpidof.py
+src/gen/filters/rules/citation/_matchesrepositoryfilter.py
+src/gen/filters/rules/citation/_matchessourcefilter.py
 
 # gen.filters.rules.media package
-src/gen/filters/rules/media/_AllMedia.py
-src/gen/filters/rules/media/_ChangedSince.py
-src/gen/filters/rules/media/_HasAttribute.py
-src/gen/filters/rules/media/_HasIdOf.py
-src/gen/filters/rules/media/_HasMedia.py
-src/gen/filters/rules/media/_HasNoteMatchingSubstringOf.py
-src/gen/filters/rules/media/_HasNoteRegexp.py
-src/gen/filters/rules/media/_HasReferenceCountOf.py
-src/gen/filters/rules/media/_HasTag.py
-src/gen/filters/rules/media/_MatchesFilter.py
-src/gen/filters/rules/media/_MediaPrivate.py
-src/gen/filters/rules/media/_RegExpIdOf.py
+src/gen/filters/rules/media/_allmedia.py
+src/gen/filters/rules/media/_changedsince.py
+src/gen/filters/rules/media/_hasattribute.py
+src/gen/filters/rules/media/_hasidof.py
+src/gen/filters/rules/media/_hasmedia.py
+src/gen/filters/rules/media/_hasnotematchingsubstringof.py
+src/gen/filters/rules/media/_hasnoteregexp.py
+src/gen/filters/rules/media/_hasreferencecountof.py
+src/gen/filters/rules/media/_hastag.py
+src/gen/filters/rules/media/_matchesfilter.py
+src/gen/filters/rules/media/_mediaprivate.py
+src/gen/filters/rules/media/_regexpidof.py
 
 # gen.filters.rules.repository package
-src/gen/filters/rules/repository/_AllRepos.py
-src/gen/filters/rules/repository/_ChangedSince.py
-src/gen/filters/rules/repository/_HasIdOf.py
-src/gen/filters/rules/repository/_HasNoteMatchingSubstringOf.py
-src/gen/filters/rules/repository/_HasNoteRegexp.py
-src/gen/filters/rules/repository/_HasReferenceCountOf.py
-src/gen/filters/rules/repository/_HasRepo.py
-src/gen/filters/rules/repository/_MatchesFilter.py
-src/gen/filters/rules/repository/_MatchesNameSubstringOf.py
-src/gen/filters/rules/repository/_RegExpIdOf.py
-src/gen/filters/rules/repository/_RepoPrivate.py
+src/gen/filters/rules/repository/_allrepos.py
+src/gen/filters/rules/repository/_changedsince.py
+src/gen/filters/rules/repository/_hasidof.py
+src/gen/filters/rules/repository/_hasnotematchingsubstringof.py
+src/gen/filters/rules/repository/_hasnoteregexp.py
+src/gen/filters/rules/repository/_hasreferencecountof.py
+src/gen/filters/rules/repository/_hasrepo.py
+src/gen/filters/rules/repository/_matchesfilter.py
+src/gen/filters/rules/repository/_matchesnamesubstringof.py
+src/gen/filters/rules/repository/_regexpidof.py
+src/gen/filters/rules/repository/_repoprivate.py
 
 # gen.filters.rules.note package
-src/gen/filters/rules/note/_AllNotes.py
-src/gen/filters/rules/note/_ChangedSince.py
-src/gen/filters/rules/note/_HasIdOf.py
-src/gen/filters/rules/note/_MatchesSubstringOf.py
-src/gen/filters/rules/note/_MatchesRegexpOf.py
-src/gen/filters/rules/note/_HasNote.py
-src/gen/filters/rules/note/_HasTag.py
-src/gen/filters/rules/note/_HasReferenceCountOf.py
-src/gen/filters/rules/note/_MatchesFilter.py
-src/gen/filters/rules/note/_RegExpIdOf.py
-src/gen/filters/rules/note/_NotePrivate.py
+src/gen/filters/rules/note/_allnotes.py
+src/gen/filters/rules/note/_changedsince.py
+src/gen/filters/rules/note/_hasidof.py
+src/gen/filters/rules/note/_matchessubstringof.py
+src/gen/filters/rules/note/_matchesregexpof.py
+src/gen/filters/rules/note/_hasnote.py
+src/gen/filters/rules/note/_hastag.py
+src/gen/filters/rules/note/_hasreferencecountof.py
+src/gen/filters/rules/note/_matchesfilter.py
+src/gen/filters/rules/note/_regexpidof.py
+src/gen/filters/rules/note/_noteprivate.py
 
 # gen lib API
 src/gen/lib/attrtype.py
@@ -381,20 +381,20 @@ src/gui/editors/displaytabs/surnametab.py
 src/gui/editors/displaytabs/webembedlist.py
 
 # gui.filters package
-src/gui/filters/_FilterStore.py
-src/gui/filters/_SearchBar.py
+src/gui/filters/_filterstore.py
+src/gui/filters/_searchbar.py
 
 # gui.filters.sidebar package
-src/gui/filters/sidebar/_CitationSidebarFilter.py
-src/gui/filters/sidebar/_EventSidebarFilter.py
-src/gui/filters/sidebar/_FamilySidebarFilter.py
-src/gui/filters/sidebar/_PersonSidebarFilter.py
-src/gui/filters/sidebar/_SidebarFilter.py
-src/gui/filters/sidebar/_SourceSidebarFilter.py
-src/gui/filters/sidebar/_PlaceSidebarFilter.py
-src/gui/filters/sidebar/_MediaSidebarFilter.py
-src/gui/filters/sidebar/_RepoSidebarFilter.py
-src/gui/filters/sidebar/_NoteSidebarFilter.py
+src/gui/filters/sidebar/_citationsidebarfilter.py
+src/gui/filters/sidebar/_eventsidebarfilter.py
+src/gui/filters/sidebar/_familysidebarfilter.py
+src/gui/filters/sidebar/_personsidebarfilter.py
+src/gui/filters/sidebar/_sidebarfilter.py
+src/gui/filters/sidebar/_sourcesidebarfilter.py
+src/gui/filters/sidebar/_placesidebarfilter.py
+src/gui/filters/sidebar/_mediasidebarfilter.py
+src/gui/filters/sidebar/_reposidebarfilter.py
+src/gui/filters/sidebar/_notesidebarfilter.py
 
 # gui plugin API (was PluginUtils and ReportBase)
 src/gui/plug/_dialogs.py
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index d401ea59d..4c3637773 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -61,42 +61,42 @@ src/gen/db/write.py
 src/gen/ggettext.py
 
 # gen.filters package
-src/gen/filters/_FilterList.py
-src/gen/filters/_GenericFilter.py
+src/gen/filters/_filterlist.py
+src/gen/filters/_genericfilter.py
 src/gen/filters/__init__.py
-src/gen/filters/_ParamFilter.py
-src/gen/filters/_SearchFilter.py
+src/gen/filters/_paramfilter.py
+src/gen/filters/_searchfilter.py
 
 # gen.filters.rules package
-src/gen/filters/rules/_ChangedSinceBase.py
-src/gen/filters/rules/_HasAttributeBase.py
-src/gen/filters/rules/_HasCitationBase.py
-src/gen/filters/rules/_HasEventBase.py
-src/gen/filters/rules/_HasGalleryBase.py
-src/gen/filters/rules/_HasLDSBase.py
-src/gen/filters/rules/_HasNoteBase.py
-src/gen/filters/rules/_HasNoteRegexBase.py
-src/gen/filters/rules/_HasNoteSubstrBase.py
-src/gen/filters/rules/_HasReferenceCountBase.py
-src/gen/filters/rules/_HasSourceBase.py
-src/gen/filters/rules/_HasSourceCountBase.py
-src/gen/filters/rules/_HasTagBase.py
-src/gen/filters/rules/_HasTextMatchingRegexpOf.py
+src/gen/filters/rules/_changedsincebase.py
+src/gen/filters/rules/_hasattributebase.py
+src/gen/filters/rules/_hascitationbase.py
+src/gen/filters/rules/_haseventbase.py
+src/gen/filters/rules/_hasgallerybase.py
+src/gen/filters/rules/_hasldsbase.py
+src/gen/filters/rules/_hasnotebase.py
+src/gen/filters/rules/_hasnoteregexbase.py
+src/gen/filters/rules/_hasnotesubstrbase.py
+src/gen/filters/rules/_hasreferencecountbase.py
+src/gen/filters/rules/_hassourcebase.py
+src/gen/filters/rules/_hassourcecountbase.py
+src/gen/filters/rules/_hastagbase.py
+src/gen/filters/rules/_hastextmatchingregexpof.py
 src/gen/filters/rules/__init__.py
-src/gen/filters/rules/_IsPublic.py
-src/gen/filters/rules/_MatchesEventFilterBase.py
-src/gen/filters/rules/_MatchesFilterBase.py
-src/gen/filters/rules/_MatchesSourceConfidenceBase.py
-src/gen/filters/rules/_MatchesSourceFilterBase.py
-src/gen/filters/rules/_RegExpIdBase.py
+src/gen/filters/rules/_ispublic.py
+src/gen/filters/rules/_matcheseventfilterbase.py
+src/gen/filters/rules/_matchesfilterbase.py
+src/gen/filters/rules/_matchessourceconfidencebase.py
+src/gen/filters/rules/_matchessourcefilterbase.py
+src/gen/filters/rules/_regexpidbase.py
 
 # gen.filters.rules.person package
 src/gen/filters/rules/person/__init__.py
-src/gen/filters/rules/person/_HasTextMatchingRegexpOf.py
+src/gen/filters/rules/person/_hastextmatchingregexpof.py
 
 # gen.filters.rules.family package
 src/gen/filters/rules/family/__init__.py
-src/gen/filters/rules/family/_MemberBase.py
+src/gen/filters/rules/family/_memberbase.py
 
 # gen.filters.rules.event package
 src/gen/filters/rules/event/__init__.py
@@ -260,8 +260,8 @@ src/gui/editors/displaytabs/surnamemodel.py
 src/gui/editors/displaytabs/webmodel.py
 
 # gui.filters package
-src/gui/filters/_FilterComboBox.py
-src/gui/filters/_FilterMenu.py
+src/gui/filters/_filtercombobox.py
+src/gui/filters/_filtermenu.py
 src/gui/filters/__init__.py
 
 # gui/selectors - the GUI selectors package
diff --git a/src/gen/filters/Makefile.am b/src/gen/filters/Makefile.am
index 32a131c68..5a755c675 100644
--- a/src/gen/filters/Makefile.am
+++ b/src/gen/filters/Makefile.am
@@ -6,12 +6,12 @@ SUBDIRS = rules
 pkgpythondir = $(datadir)/@PACKAGE@/gen/filters
 
 pkgpython_PYTHON = \
-	_FilterList.py \
-	_FilterParser.py \
-	_GenericFilter.py \
-	_ParamFilter.py \
+	_filterlist.py \
+	_filterparser.py \
+	_genericfilter.py \
+	_paramfilter.py \
 	__init__.py \
-	_SearchFilter.py
+	_searchfilter.py
 
 pkgpyexecdir = @pkgpyexecdir@/gen/filters
 
diff --git a/src/gen/filters/__init__.py b/src/gen/filters/__init__.py
index c9af8d2e8..3579aa8b1 100644
--- a/src/gen/filters/__init__.py
+++ b/src/gen/filters/__init__.py
@@ -28,10 +28,10 @@ Package providing filtering framework for GRAMPS.
 CustomFilters = None
 
 from const import CUSTOM_FILTERS
-from _FilterList import FilterList
-from _GenericFilter import GenericFilter, GenericFilterFactory
-from _ParamFilter import ParamFilter
-from _SearchFilter import SearchFilter, ExactSearchFilter
+from _filterlist import FilterList
+from _genericfilter import GenericFilter, GenericFilterFactory
+from _paramfilter import ParamFilter
+from _searchfilter import SearchFilter, ExactSearchFilter
 
 #def reload_system_filters():
     #global SystemFilters
diff --git a/src/gen/filters/_FilterList.py b/src/gen/filters/_filterlist.py
similarity index 100%
rename from src/gen/filters/_FilterList.py
rename to src/gen/filters/_filterlist.py
diff --git a/src/gen/filters/_FilterParser.py b/src/gen/filters/_filterparser.py
similarity index 100%
rename from src/gen/filters/_FilterParser.py
rename to src/gen/filters/_filterparser.py
diff --git a/src/gen/filters/_GenericFilter.py b/src/gen/filters/_genericfilter.py
similarity index 100%
rename from src/gen/filters/_GenericFilter.py
rename to src/gen/filters/_genericfilter.py
diff --git a/src/gen/filters/_ParamFilter.py b/src/gen/filters/_paramfilter.py
similarity index 100%
rename from src/gen/filters/_ParamFilter.py
rename to src/gen/filters/_paramfilter.py
diff --git a/src/gen/filters/_SearchFilter.py b/src/gen/filters/_searchfilter.py
similarity index 100%
rename from src/gen/filters/_SearchFilter.py
rename to src/gen/filters/_searchfilter.py
diff --git a/src/gen/filters/rules/Makefile.am b/src/gen/filters/rules/Makefile.am
index c0306e5f1..55ddf08fe 100644
--- a/src/gen/filters/rules/Makefile.am
+++ b/src/gen/filters/rules/Makefile.am
@@ -6,32 +6,32 @@ SUBDIRS = person family event place source media repository note citation
 pkgpythondir = $(datadir)/@PACKAGE@/gen/filters/rules
 
 pkgpython_PYTHON = \
-	_ChangedSinceBase.py\
-	_Everything.py\
-	_HasEventBase.py\
-	_HasAttributeBase.py\
-	_HasGalleryBase.py \
-	_HasGrampsId.py\
-	_HasLDSBase.py \
-	_HasNoteBase.py \
-	_HasNoteRegexBase.py\
-	_HasNoteSubstrBase.py\
-	_HasReferenceCountBase.py \
-	_HasSourceCountBase.py \
-	_HasSourceBase.py \
-	_HasTagBase.py \
-	_HasTextMatchingRegexpOf.py\
-	_HasTextMatchingSubstringOf.py\
+	_changedsincebase.py\
+	_everything.py\
+	_haseventbase.py\
+	_hasattributebase.py\
+	_hasgallerybase.py \
+	_hasgrampsid.py\
+	_hasldsbase.py \
+	_hasnotebase.py \
+	_hasnoteregexbase.py\
+	_hasnotesubstrbase.py\
+	_hasreferencecountbase.py \
+	_hassourcecountbase.py \
+	_hassourcebase.py \
+	_hastagbase.py \
+	_hastextmatchingregexpof.py\
+	_hastextmatchingsubstringof.py\
 	__init__.py\
-	_IsPrivate.py\
-        _IsPublic.py\
-	_RegExpIdBase.py\
-	_Rule.py\
-	_MatchesFilterBase.py\
-    _MatchesEventFilterBase.py \
-    _MatchesSourceConfidenceBase.py \
-    _MatchesSourceFilterBase.py \
-    _HasCitationBase.py
+	_isprivate.py\
+        _ispublic.py\
+	_regexpidbase.py\
+	_rule.py\
+	_matchesfilterbase.py\
+    _matcheseventfilterbase.py \
+    _matchessourceconfidencebase.py \
+    _matchessourcefilterbase.py \
+    _hascitationbase.py
 
 
 pkgpyexecdir = @pkgpyexecdir@/gen/filters/rules
diff --git a/src/gen/filters/rules/__init__.py b/src/gen/filters/rules/__init__.py
index 10f98439e..09644d5e5 100644
--- a/src/gen/filters/rules/__init__.py
+++ b/src/gen/filters/rules/__init__.py
@@ -69,19 +69,19 @@ _Everything                  Match every object in the database
 
 # Need to expose this to be available for filter plugins:
 # the plugins should say: from gen.filters.rules import Rule
-from gen.filters.rules._Rule import Rule
+from gen.filters.rules._rule import Rule
 
-from gen.filters.rules._Everything import Everything
-from gen.filters.rules._HasGrampsId import HasGrampsId
-from gen.filters.rules._IsPrivate import IsPrivate
-from gen.filters.rules._IsPublic import IsPublic
-from gen.filters.rules._HasTextMatchingSubstringOf import HasTextMatchingSubstringOf
-from gen.filters.rules._HasTextMatchingRegexpOf import HasTextMatchingRegexpOf
-from gen.filters.rules._MatchesFilterBase import MatchesFilterBase
-from gen.filters.rules._MatchesEventFilterBase import MatchesEventFilterBase
-from gen.filters.rules._MatchesSourceConfidenceBase import MatchesSourceConfidenceBase
-from gen.filters.rules._MatchesSourceFilterBase import MatchesSourceFilterBase
-from gen.filters.rules._ChangedSinceBase import ChangedSinceBase
+from gen.filters.rules._everything import Everything
+from gen.filters.rules._hasgrampsid import HasGrampsId
+from gen.filters.rules._isprivate import IsPrivate
+from gen.filters.rules._ispublic import IsPublic
+from gen.filters.rules._hastextmatchingsubstringof import HasTextMatchingSubstringOf
+from gen.filters.rules._hastextmatchingregexpof import HasTextMatchingRegexpOf
+from gen.filters.rules._matchesfilterbase import MatchesFilterBase
+from gen.filters.rules._matcheseventfilterbase import MatchesEventFilterBase
+from gen.filters.rules._matchessourceconfidencebase import MatchesSourceConfidenceBase
+from gen.filters.rules._matchessourcefilterbase import MatchesSourceFilterBase
+from gen.filters.rules._changedsincebase import ChangedSinceBase
 
 from gen.filters.rules import (person, family, event, source, citation, place, 
                            media, repository, note)
diff --git a/src/gen/filters/rules/_ChangedSinceBase.py b/src/gen/filters/rules/_changedsincebase.py
similarity index 100%
rename from src/gen/filters/rules/_ChangedSinceBase.py
rename to src/gen/filters/rules/_changedsincebase.py
diff --git a/src/gen/filters/rules/_Everything.py b/src/gen/filters/rules/_everything.py
similarity index 100%
rename from src/gen/filters/rules/_Everything.py
rename to src/gen/filters/rules/_everything.py
diff --git a/src/gen/filters/rules/_HasAttributeBase.py b/src/gen/filters/rules/_hasattributebase.py
similarity index 100%
rename from src/gen/filters/rules/_HasAttributeBase.py
rename to src/gen/filters/rules/_hasattributebase.py
diff --git a/src/gen/filters/rules/_HasCitationBase.py b/src/gen/filters/rules/_hascitationbase.py
similarity index 100%
rename from src/gen/filters/rules/_HasCitationBase.py
rename to src/gen/filters/rules/_hascitationbase.py
diff --git a/src/gen/filters/rules/_HasEventBase.py b/src/gen/filters/rules/_haseventbase.py
similarity index 100%
rename from src/gen/filters/rules/_HasEventBase.py
rename to src/gen/filters/rules/_haseventbase.py
diff --git a/src/gen/filters/rules/_HasGalleryBase.py b/src/gen/filters/rules/_hasgallerybase.py
similarity index 100%
rename from src/gen/filters/rules/_HasGalleryBase.py
rename to src/gen/filters/rules/_hasgallerybase.py
diff --git a/src/gen/filters/rules/_HasGrampsId.py b/src/gen/filters/rules/_hasgrampsid.py
similarity index 100%
rename from src/gen/filters/rules/_HasGrampsId.py
rename to src/gen/filters/rules/_hasgrampsid.py
diff --git a/src/gen/filters/rules/_HasLDSBase.py b/src/gen/filters/rules/_hasldsbase.py
similarity index 100%
rename from src/gen/filters/rules/_HasLDSBase.py
rename to src/gen/filters/rules/_hasldsbase.py
diff --git a/src/gen/filters/rules/_HasNoteBase.py b/src/gen/filters/rules/_hasnotebase.py
similarity index 100%
rename from src/gen/filters/rules/_HasNoteBase.py
rename to src/gen/filters/rules/_hasnotebase.py
diff --git a/src/gen/filters/rules/_HasNoteRegexBase.py b/src/gen/filters/rules/_hasnoteregexbase.py
similarity index 100%
rename from src/gen/filters/rules/_HasNoteRegexBase.py
rename to src/gen/filters/rules/_hasnoteregexbase.py
diff --git a/src/gen/filters/rules/_HasNoteSubstrBase.py b/src/gen/filters/rules/_hasnotesubstrbase.py
similarity index 100%
rename from src/gen/filters/rules/_HasNoteSubstrBase.py
rename to src/gen/filters/rules/_hasnotesubstrbase.py
diff --git a/src/gen/filters/rules/_HasReferenceCountBase.py b/src/gen/filters/rules/_hasreferencecountbase.py
similarity index 100%
rename from src/gen/filters/rules/_HasReferenceCountBase.py
rename to src/gen/filters/rules/_hasreferencecountbase.py
diff --git a/src/gen/filters/rules/_HasSourceBase.py b/src/gen/filters/rules/_hassourcebase.py
similarity index 100%
rename from src/gen/filters/rules/_HasSourceBase.py
rename to src/gen/filters/rules/_hassourcebase.py
diff --git a/src/gen/filters/rules/_HasSourceCountBase.py b/src/gen/filters/rules/_hassourcecountbase.py
similarity index 100%
rename from src/gen/filters/rules/_HasSourceCountBase.py
rename to src/gen/filters/rules/_hassourcecountbase.py
diff --git a/src/gen/filters/rules/_HasTagBase.py b/src/gen/filters/rules/_hastagbase.py
similarity index 100%
rename from src/gen/filters/rules/_HasTagBase.py
rename to src/gen/filters/rules/_hastagbase.py
diff --git a/src/gen/filters/rules/_HasTextMatchingRegexpOf.py b/src/gen/filters/rules/_hastextmatchingregexpof.py
similarity index 100%
rename from src/gen/filters/rules/_HasTextMatchingRegexpOf.py
rename to src/gen/filters/rules/_hastextmatchingregexpof.py
diff --git a/src/gen/filters/rules/_HasTextMatchingSubstringOf.py b/src/gen/filters/rules/_hastextmatchingsubstringof.py
similarity index 100%
rename from src/gen/filters/rules/_HasTextMatchingSubstringOf.py
rename to src/gen/filters/rules/_hastextmatchingsubstringof.py
diff --git a/src/gen/filters/rules/_IsPrivate.py b/src/gen/filters/rules/_isprivate.py
similarity index 100%
rename from src/gen/filters/rules/_IsPrivate.py
rename to src/gen/filters/rules/_isprivate.py
diff --git a/src/gen/filters/rules/_IsPublic.py b/src/gen/filters/rules/_ispublic.py
similarity index 100%
rename from src/gen/filters/rules/_IsPublic.py
rename to src/gen/filters/rules/_ispublic.py
diff --git a/src/gen/filters/rules/_MatchesEventFilterBase.py b/src/gen/filters/rules/_matcheseventfilterbase.py
similarity index 100%
rename from src/gen/filters/rules/_MatchesEventFilterBase.py
rename to src/gen/filters/rules/_matcheseventfilterbase.py
diff --git a/src/gen/filters/rules/_MatchesFilterBase.py b/src/gen/filters/rules/_matchesfilterbase.py
similarity index 100%
rename from src/gen/filters/rules/_MatchesFilterBase.py
rename to src/gen/filters/rules/_matchesfilterbase.py
diff --git a/src/gen/filters/rules/_MatchesSourceConfidenceBase.py b/src/gen/filters/rules/_matchessourceconfidencebase.py
similarity index 100%
rename from src/gen/filters/rules/_MatchesSourceConfidenceBase.py
rename to src/gen/filters/rules/_matchessourceconfidencebase.py
diff --git a/src/gen/filters/rules/_MatchesSourceFilterBase.py b/src/gen/filters/rules/_matchessourcefilterbase.py
similarity index 100%
rename from src/gen/filters/rules/_MatchesSourceFilterBase.py
rename to src/gen/filters/rules/_matchessourcefilterbase.py
diff --git a/src/gen/filters/rules/_RegExpIdBase.py b/src/gen/filters/rules/_regexpidbase.py
similarity index 100%
rename from src/gen/filters/rules/_RegExpIdBase.py
rename to src/gen/filters/rules/_regexpidbase.py
diff --git a/src/gen/filters/rules/_Rule.py b/src/gen/filters/rules/_rule.py
similarity index 100%
rename from src/gen/filters/rules/_Rule.py
rename to src/gen/filters/rules/_rule.py
diff --git a/src/gen/filters/rules/citation/Makefile.am b/src/gen/filters/rules/citation/Makefile.am
index 44a9a473d..4ceccfa7d 100644
--- a/src/gen/filters/rules/citation/Makefile.am
+++ b/src/gen/filters/rules/citation/Makefile.am
@@ -5,21 +5,21 @@ pkgpythondir = $(datadir)/@PACKAGE@/gen/filters/rules/citation
 
 pkgpython_PYTHON = \
 	__init__.py \
-	_AllCitations.py \
-	_ChangedSince.py \
-	_CitationPrivate.py \
-	_HasGallery.py \
-	_HasIdOf.py \
-	_HasNote.py \
-	_HasNoteMatchingSubstringOf.py \
-	_HasNoteRegexp.py \
-	_HasReferenceCountOf.py \
-	_HasSource.py \
-	_MatchesFilter.py \
-	_MatchesPageSubstringOf.py \
-	_MatchesRepositoryFilter.py \
-	_MatchesSourceFilter.py \
-	_RegExpIdOf.py
+	_allcitations.py \
+	_changedsince.py \
+	_citationprivate.py \
+	_hasgallery.py \
+	_hasidof.py \
+	_hasnote.py \
+	_hasnotematchingsubstringof.py \
+	_hasnoteregexp.py \
+	_hasreferencecountof.py \
+	_hassource.py \
+	_matchesfilter.py \
+	_matchespagesubstringof.py \
+	_matchesrepositoryfilter.py \
+	_matchessourcefilter.py \
+	_regexpidof.py
 
 pkgpyexecdir = @pkgpyexecdir@/gen/filters/rules/citation
 
diff --git a/src/gen/filters/rules/citation/__init__.py b/src/gen/filters/rules/citation/__init__.py
index f3ada19e1..f7393241e 100644
--- a/src/gen/filters/rules/citation/__init__.py
+++ b/src/gen/filters/rules/citation/__init__.py
@@ -26,23 +26,23 @@
 Package providing filter rules for GRAMPS.
 """
 
-from gen.filters.rules._HasCitationBase import HasCitationBase as HasCitation
+from gen.filters.rules._hascitationbase import HasCitationBase as HasCitation
 
-from _AllCitations import AllCitations
-from _ChangedSince import ChangedSince
-from _CitationPrivate import CitationPrivate
-from _HasGallery import HasGallery
-from _HasIdOf import HasIdOf
-from _HasNote import HasNote
-from _HasNoteMatchingSubstringOf import HasNoteMatchingSubstringOf
-from _HasNoteRegexp import HasNoteRegexp
-from _HasReferenceCountOf import HasReferenceCountOf
-from _HasSource import HasSource
-from _MatchesFilter import MatchesFilter
-from _MatchesPageSubstringOf import MatchesPageSubstringOf
-from _MatchesRepositoryFilter import MatchesRepositoryFilter
-from _MatchesSourceFilter import MatchesSourceFilter
-from _RegExpIdOf import RegExpIdOf
+from _allcitations import AllCitations
+from _changedsince import ChangedSince
+from _citationprivate import CitationPrivate
+from _hasgallery import HasGallery
+from _hasidof import HasIdOf
+from _hasnote import HasNote
+from _hasnotematchingsubstringof import HasNoteMatchingSubstringOf
+from _hasnoteregexp import HasNoteRegexp
+from _hasreferencecountof import HasReferenceCountOf
+from _hassource import HasSource
+from _matchesfilter import MatchesFilter
+from _matchespagesubstringof import MatchesPageSubstringOf
+from _matchesrepositoryfilter import MatchesRepositoryFilter
+from _matchessourcefilter import MatchesSourceFilter
+from _regexpidof import RegExpIdOf
 
 editor_rule_list = [
     AllCitations,
diff --git a/src/gen/filters/rules/citation/_AllCitations.py b/src/gen/filters/rules/citation/_allcitations.py
similarity index 100%
rename from src/gen/filters/rules/citation/_AllCitations.py
rename to src/gen/filters/rules/citation/_allcitations.py
diff --git a/src/gen/filters/rules/citation/_ChangedSince.py b/src/gen/filters/rules/citation/_changedsince.py
similarity index 100%
rename from src/gen/filters/rules/citation/_ChangedSince.py
rename to src/gen/filters/rules/citation/_changedsince.py
diff --git a/src/gen/filters/rules/citation/_CitationPrivate.py b/src/gen/filters/rules/citation/_citationprivate.py
similarity index 100%
rename from src/gen/filters/rules/citation/_CitationPrivate.py
rename to src/gen/filters/rules/citation/_citationprivate.py
diff --git a/src/gen/filters/rules/citation/_HasGallery.py b/src/gen/filters/rules/citation/_hasgallery.py
similarity index 100%
rename from src/gen/filters/rules/citation/_HasGallery.py
rename to src/gen/filters/rules/citation/_hasgallery.py
diff --git a/src/gen/filters/rules/citation/_HasIdOf.py b/src/gen/filters/rules/citation/_hasidof.py
similarity index 100%
rename from src/gen/filters/rules/citation/_HasIdOf.py
rename to src/gen/filters/rules/citation/_hasidof.py
diff --git a/src/gen/filters/rules/citation/_HasNote.py b/src/gen/filters/rules/citation/_hasnote.py
similarity index 100%
rename from src/gen/filters/rules/citation/_HasNote.py
rename to src/gen/filters/rules/citation/_hasnote.py
diff --git a/src/gen/filters/rules/citation/_HasNoteMatchingSubstringOf.py b/src/gen/filters/rules/citation/_hasnotematchingsubstringof.py
similarity index 100%
rename from src/gen/filters/rules/citation/_HasNoteMatchingSubstringOf.py
rename to src/gen/filters/rules/citation/_hasnotematchingsubstringof.py
diff --git a/src/gen/filters/rules/citation/_HasNoteRegexp.py b/src/gen/filters/rules/citation/_hasnoteregexp.py
similarity index 100%
rename from src/gen/filters/rules/citation/_HasNoteRegexp.py
rename to src/gen/filters/rules/citation/_hasnoteregexp.py
diff --git a/src/gen/filters/rules/citation/_HasReferenceCountOf.py b/src/gen/filters/rules/citation/_hasreferencecountof.py
similarity index 100%
rename from src/gen/filters/rules/citation/_HasReferenceCountOf.py
rename to src/gen/filters/rules/citation/_hasreferencecountof.py
diff --git a/src/gen/filters/rules/citation/_HasSource.py b/src/gen/filters/rules/citation/_hassource.py
similarity index 100%
rename from src/gen/filters/rules/citation/_HasSource.py
rename to src/gen/filters/rules/citation/_hassource.py
diff --git a/src/gen/filters/rules/citation/_MatchesFilter.py b/src/gen/filters/rules/citation/_matchesfilter.py
similarity index 100%
rename from src/gen/filters/rules/citation/_MatchesFilter.py
rename to src/gen/filters/rules/citation/_matchesfilter.py
diff --git a/src/gen/filters/rules/citation/_MatchesPageSubstringOf.py b/src/gen/filters/rules/citation/_matchespagesubstringof.py
similarity index 100%
rename from src/gen/filters/rules/citation/_MatchesPageSubstringOf.py
rename to src/gen/filters/rules/citation/_matchespagesubstringof.py
diff --git a/src/gen/filters/rules/citation/_MatchesRepositoryFilter.py b/src/gen/filters/rules/citation/_matchesrepositoryfilter.py
similarity index 100%
rename from src/gen/filters/rules/citation/_MatchesRepositoryFilter.py
rename to src/gen/filters/rules/citation/_matchesrepositoryfilter.py
diff --git a/src/gen/filters/rules/citation/_MatchesSourceFilter.py b/src/gen/filters/rules/citation/_matchessourcefilter.py
similarity index 100%
rename from src/gen/filters/rules/citation/_MatchesSourceFilter.py
rename to src/gen/filters/rules/citation/_matchessourcefilter.py
diff --git a/src/gen/filters/rules/citation/_RegExpIdOf.py b/src/gen/filters/rules/citation/_regexpidof.py
similarity index 100%
rename from src/gen/filters/rules/citation/_RegExpIdOf.py
rename to src/gen/filters/rules/citation/_regexpidof.py
diff --git a/src/gen/filters/rules/event/Makefile.am b/src/gen/filters/rules/event/Makefile.am
index 5231c69c2..a61ab8133 100644
--- a/src/gen/filters/rules/event/Makefile.am
+++ b/src/gen/filters/rules/event/Makefile.am
@@ -4,25 +4,25 @@
 pkgpythondir = $(datadir)/@PACKAGE@/gen/filters/rules/event
 
 pkgpython_PYTHON = \
-	_ChangedSince.py\
-	_MatchesFilter.py\
-	_EventPrivate.py\
-	_HasNoteRegexp.py\
-	_RegExpIdOf.py\
-	_AllEvents.py\
-	_HasCitation.py \
-	_HasData.py\
-	_HasGallery.py \
-	_HasIdOf.py\
-	_HasNote.py \
-    _HasSourceCount.py \
-	_HasType.py\
-	_HasNoteMatchingSubstringOf.py\
-	_HasReferenceCountOf.py\
-	_MatchesPersonFilter.py\
-        _MatchesSourceConfidence.py\
-	_MatchesSourceFilter.py\
-	_HasAttribute.py\
+	_changedsince.py\
+	_matchesfilter.py\
+	_eventprivate.py\
+	_hasnoteregexp.py\
+	_regexpidof.py\
+	_allevents.py\
+	_hascitation.py \
+	_hasdata.py\
+	_hasgallery.py \
+	_hasidof.py\
+	_hasnote.py \
+    _hassourcecount.py \
+	_hastype.py\
+	_hasnotematchingsubstringof.py\
+	_hasreferencecountof.py\
+	_matchespersonfilter.py\
+        _matchessourceconfidence.py\
+	_matchessourcefilter.py\
+	_hasattribute.py\
 	__init__.py
 
 pkgpyexecdir = @pkgpyexecdir@/gen/filters/rules/event
diff --git a/src/gen/filters/rules/event/__init__.py b/src/gen/filters/rules/event/__init__.py
index e986a1aaa..725cae120 100644
--- a/src/gen/filters/rules/event/__init__.py
+++ b/src/gen/filters/rules/event/__init__.py
@@ -26,27 +26,27 @@
 Package providing filter rules for GRAMPS.
 """
 
-from gen.filters.rules._HasEventBase import HasEventBase as HasEvent
+from gen.filters.rules._haseventbase import HasEventBase as HasEvent
 
-from _HasType import HasType
-from _AllEvents import AllEvents
-from _HasGallery import HasGallery
-from _HasIdOf import HasIdOf
-from _RegExpIdOf import RegExpIdOf
-from _HasCitation import HasCitation
-from _HasNote import HasNote
-from _HasNoteRegexp import HasNoteRegexp
-from _HasNoteMatchingSubstringOf import HasNoteMatchingSubstringOf
-from _HasReferenceCountOf import HasReferenceCountOf
-from _HasSourceCount import HasSourceCount
-from _EventPrivate import EventPrivate
-from _MatchesFilter import MatchesFilter
-from _MatchesPersonFilter import MatchesPersonFilter
-from _MatchesSourceConfidence import MatchesSourceConfidence
-from _MatchesSourceFilter import MatchesSourceFilter
-from _HasAttribute import HasAttribute
-from _HasData import HasData
-from _ChangedSince import ChangedSince
+from _hastype import HasType
+from _allevents import AllEvents
+from _hasgallery import HasGallery
+from _hasidof import HasIdOf
+from _regexpidof import RegExpIdOf
+from _hascitation import HasCitation
+from _hasnote import HasNote
+from _hasnoteregexp import HasNoteRegexp
+from _hasnotematchingsubstringof import HasNoteMatchingSubstringOf
+from _hasreferencecountof import HasReferenceCountOf
+from _hassourcecount import HasSourceCount
+from _eventprivate import EventPrivate
+from _matchesfilter import MatchesFilter
+from _matchespersonfilter import MatchesPersonFilter
+from _matchessourceconfidence import MatchesSourceConfidence
+from _matchessourcefilter import MatchesSourceFilter
+from _hasattribute import HasAttribute
+from _hasdata import HasData
+from _changedsince import ChangedSince
 
 editor_rule_list = [
     AllEvents,
diff --git a/src/gen/filters/rules/event/_AllEvents.py b/src/gen/filters/rules/event/_allevents.py
similarity index 100%
rename from src/gen/filters/rules/event/_AllEvents.py
rename to src/gen/filters/rules/event/_allevents.py
diff --git a/src/gen/filters/rules/event/_ChangedSince.py b/src/gen/filters/rules/event/_changedsince.py
similarity index 100%
rename from src/gen/filters/rules/event/_ChangedSince.py
rename to src/gen/filters/rules/event/_changedsince.py
diff --git a/src/gen/filters/rules/event/_EventPrivate.py b/src/gen/filters/rules/event/_eventprivate.py
similarity index 100%
rename from src/gen/filters/rules/event/_EventPrivate.py
rename to src/gen/filters/rules/event/_eventprivate.py
diff --git a/src/gen/filters/rules/event/_HasAttribute.py b/src/gen/filters/rules/event/_hasattribute.py
similarity index 100%
rename from src/gen/filters/rules/event/_HasAttribute.py
rename to src/gen/filters/rules/event/_hasattribute.py
diff --git a/src/gen/filters/rules/event/_HasCitation.py b/src/gen/filters/rules/event/_hascitation.py
similarity index 100%
rename from src/gen/filters/rules/event/_HasCitation.py
rename to src/gen/filters/rules/event/_hascitation.py
diff --git a/src/gen/filters/rules/event/_HasData.py b/src/gen/filters/rules/event/_hasdata.py
similarity index 100%
rename from src/gen/filters/rules/event/_HasData.py
rename to src/gen/filters/rules/event/_hasdata.py
diff --git a/src/gen/filters/rules/event/_HasGallery.py b/src/gen/filters/rules/event/_hasgallery.py
similarity index 100%
rename from src/gen/filters/rules/event/_HasGallery.py
rename to src/gen/filters/rules/event/_hasgallery.py
diff --git a/src/gen/filters/rules/event/_HasIdOf.py b/src/gen/filters/rules/event/_hasidof.py
similarity index 100%
rename from src/gen/filters/rules/event/_HasIdOf.py
rename to src/gen/filters/rules/event/_hasidof.py
diff --git a/src/gen/filters/rules/event/_HasNote.py b/src/gen/filters/rules/event/_hasnote.py
similarity index 100%
rename from src/gen/filters/rules/event/_HasNote.py
rename to src/gen/filters/rules/event/_hasnote.py
diff --git a/src/gen/filters/rules/event/_HasNoteMatchingSubstringOf.py b/src/gen/filters/rules/event/_hasnotematchingsubstringof.py
similarity index 100%
rename from src/gen/filters/rules/event/_HasNoteMatchingSubstringOf.py
rename to src/gen/filters/rules/event/_hasnotematchingsubstringof.py
diff --git a/src/gen/filters/rules/event/_HasNoteRegexp.py b/src/gen/filters/rules/event/_hasnoteregexp.py
similarity index 100%
rename from src/gen/filters/rules/event/_HasNoteRegexp.py
rename to src/gen/filters/rules/event/_hasnoteregexp.py
diff --git a/src/gen/filters/rules/event/_HasReferenceCountOf.py b/src/gen/filters/rules/event/_hasreferencecountof.py
similarity index 100%
rename from src/gen/filters/rules/event/_HasReferenceCountOf.py
rename to src/gen/filters/rules/event/_hasreferencecountof.py
diff --git a/src/gen/filters/rules/event/_HasSourceCount.py b/src/gen/filters/rules/event/_hassourcecount.py
similarity index 100%
rename from src/gen/filters/rules/event/_HasSourceCount.py
rename to src/gen/filters/rules/event/_hassourcecount.py
diff --git a/src/gen/filters/rules/event/_HasType.py b/src/gen/filters/rules/event/_hastype.py
similarity index 100%
rename from src/gen/filters/rules/event/_HasType.py
rename to src/gen/filters/rules/event/_hastype.py
diff --git a/src/gen/filters/rules/event/_MatchesFilter.py b/src/gen/filters/rules/event/_matchesfilter.py
similarity index 100%
rename from src/gen/filters/rules/event/_MatchesFilter.py
rename to src/gen/filters/rules/event/_matchesfilter.py
diff --git a/src/gen/filters/rules/event/_MatchesPersonFilter.py b/src/gen/filters/rules/event/_matchespersonfilter.py
similarity index 100%
rename from src/gen/filters/rules/event/_MatchesPersonFilter.py
rename to src/gen/filters/rules/event/_matchespersonfilter.py
diff --git a/src/gen/filters/rules/event/_MatchesSourceConfidence.py b/src/gen/filters/rules/event/_matchessourceconfidence.py
similarity index 100%
rename from src/gen/filters/rules/event/_MatchesSourceConfidence.py
rename to src/gen/filters/rules/event/_matchessourceconfidence.py
diff --git a/src/gen/filters/rules/event/_MatchesSourceFilter.py b/src/gen/filters/rules/event/_matchessourcefilter.py
similarity index 100%
rename from src/gen/filters/rules/event/_MatchesSourceFilter.py
rename to src/gen/filters/rules/event/_matchessourcefilter.py
diff --git a/src/gen/filters/rules/event/_RegExpIdOf.py b/src/gen/filters/rules/event/_regexpidof.py
similarity index 100%
rename from src/gen/filters/rules/event/_RegExpIdOf.py
rename to src/gen/filters/rules/event/_regexpidof.py
diff --git a/src/gen/filters/rules/family/Makefile.am b/src/gen/filters/rules/family/Makefile.am
index c3f9338fc..f811bd946 100644
--- a/src/gen/filters/rules/family/Makefile.am
+++ b/src/gen/filters/rules/family/Makefile.am
@@ -4,40 +4,40 @@
 pkgpythondir = $(datadir)/@PACKAGE@/gen/filters/rules/family
 
 pkgpython_PYTHON = \
-	_AllFamilies.py\
-	_ChangedSince.py\
-	_FamilyPrivate.py\
-	_HasEvent.py\
-	_HasAttribute.py\
-	_HasCitation.py \
-	_HasGallery.py \
-	_HasIdOf.py\
-	_HasLDS.py \
-	_HasNote.py \
-	_HasNoteMatchingSubstringOf.py\
-	_HasNoteRegexp.py\
-	_HasReferenceCountOf.py\
-	_HasRelType.py\
-	_HasSourceCount.py \
-	_HasTag.py \
+	_allfamilies.py\
+	_changedsince.py\
+	_familyprivate.py\
+	_hasevent.py\
+	_hasattribute.py\
+	_hascitation.py \
+	_hasgallery.py \
+	_hasidof.py\
+	_haslds.py \
+	_hasnote.py \
+	_hasnotematchingsubstringof.py\
+	_hasnoteregexp.py\
+	_hasreferencecountof.py\
+	_hasreltype.py\
+	_hassourcecount.py \
+	_hastag.py \
 	__init__.py\
-	_IsBookmarked.py\
-	_RegExpIdOf.py\
-	_MatchesFilter.py\
-        _MatchesSourceConfidence.py\
-	_FatherHasNameOf.py\
-	_FatherHasIdOf.py\
-	_MotherHasNameOf.py\
-	_MotherHasIdOf.py\
-	_ChildHasNameOf.py\
-	_ChildHasIdOf.py\
-	_SearchFatherName.py\
-	_SearchMotherName.py\
-	_SearchChildName.py\
-	_RegExpFatherName.py\
-	_RegExpMotherName.py\
-	_RegExpChildName.py\
-	_MemberBase.py
+	_isbookmarked.py\
+	_regexpidof.py\
+	_matchesfilter.py\
+        _matchessourceconfidence.py\
+	_fatherhasnameof.py\
+	_fatherhasidof.py\
+	_motherhasnameof.py\
+	_motherhasidof.py\
+	_childhasnameof.py\
+	_childhasidof.py\
+	_searchfathername.py\
+	_searchmothername.py\
+	_searchchildname.py\
+	_regexpfathername.py\
+	_regexpmothername.py\
+	_regexpchildname.py\
+	_memberbase.py
 
 
 pkgpyexecdir = @pkgpyexecdir@/gen/filters/rules/family
diff --git a/src/gen/filters/rules/family/__init__.py b/src/gen/filters/rules/family/__init__.py
index db9f0a1b3..1a72cc094 100644
--- a/src/gen/filters/rules/family/__init__.py
+++ b/src/gen/filters/rules/family/__init__.py
@@ -26,39 +26,39 @@
 Package providing filter rules for GRAMPS.
 """
 
-from _SearchFatherName import SearchFatherName
-from _SearchMotherName import SearchMotherName
-from _SearchChildName import SearchChildName
-from _RegExpFatherName import RegExpFatherName
-from _RegExpMotherName import RegExpMotherName
-from _RegExpChildName import RegExpChildName
+from _searchfathername import SearchFatherName
+from _searchmothername import SearchMotherName
+from _searchchildname import SearchChildName
+from _regexpfathername import RegExpFatherName
+from _regexpmothername import RegExpMotherName
+from _regexpchildname import RegExpChildName
 
-from _HasRelType import HasRelType
-from _AllFamilies import AllFamilies
-from _HasGallery import HasGallery
-from _HasIdOf import HasIdOf
-from _HasLDS import HasLDS
-from _RegExpIdOf import RegExpIdOf
-from _HasNote import HasNote
-from _HasNoteRegexp import HasNoteRegexp
-from _HasNoteMatchingSubstringOf import HasNoteMatchingSubstringOf
-from _HasSourceCount import HasSourceCount
-from _HasReferenceCountOf import HasReferenceCountOf
-from _HasCitation import HasCitation
-from _FamilyPrivate import FamilyPrivate
-from _HasAttribute import HasAttribute
-from _HasEvent import HasEvent
-from _IsBookmarked import IsBookmarked
-from _MatchesFilter import MatchesFilter
-from _MatchesSourceConfidence import MatchesSourceConfidence
-from _FatherHasNameOf import FatherHasNameOf
-from _FatherHasIdOf import FatherHasIdOf
-from _MotherHasNameOf import MotherHasNameOf
-from _MotherHasIdOf import MotherHasIdOf
-from _ChildHasNameOf import ChildHasNameOf
-from _ChildHasIdOf import ChildHasIdOf
-from _ChangedSince import ChangedSince
-from _HasTag import HasTag
+from _hasreltype import HasRelType
+from _allfamilies import AllFamilies
+from _hasgallery import HasGallery
+from _hasidof import HasIdOf
+from _haslds import HasLDS
+from _regexpidof import RegExpIdOf
+from _hasnote import HasNote
+from _hasnoteregexp import HasNoteRegexp
+from _hasnotematchingsubstringof import HasNoteMatchingSubstringOf
+from _hassourcecount import HasSourceCount
+from _hasreferencecountof import HasReferenceCountOf
+from _hascitation import HasCitation
+from _familyprivate import FamilyPrivate
+from _hasattribute import HasAttribute
+from _hasevent import HasEvent
+from _isbookmarked import IsBookmarked
+from _matchesfilter import MatchesFilter
+from _matchessourceconfidence import MatchesSourceConfidence
+from _fatherhasnameof import FatherHasNameOf
+from _fatherhasidof import FatherHasIdOf
+from _motherhasnameof import MotherHasNameOf
+from _motherhasidof import MotherHasIdOf
+from _childhasnameof import ChildHasNameOf
+from _childhasidof import ChildHasIdOf
+from _changedsince import ChangedSince
+from _hastag import HasTag
 
 editor_rule_list = [
     AllFamilies,
diff --git a/src/gen/filters/rules/family/_AllFamilies.py b/src/gen/filters/rules/family/_allfamilies.py
similarity index 100%
rename from src/gen/filters/rules/family/_AllFamilies.py
rename to src/gen/filters/rules/family/_allfamilies.py
diff --git a/src/gen/filters/rules/family/_ChangedSince.py b/src/gen/filters/rules/family/_changedsince.py
similarity index 100%
rename from src/gen/filters/rules/family/_ChangedSince.py
rename to src/gen/filters/rules/family/_changedsince.py
diff --git a/src/gen/filters/rules/family/_ChildHasIdOf.py b/src/gen/filters/rules/family/_childhasidof.py
similarity index 100%
rename from src/gen/filters/rules/family/_ChildHasIdOf.py
rename to src/gen/filters/rules/family/_childhasidof.py
diff --git a/src/gen/filters/rules/family/_ChildHasNameOf.py b/src/gen/filters/rules/family/_childhasnameof.py
similarity index 100%
rename from src/gen/filters/rules/family/_ChildHasNameOf.py
rename to src/gen/filters/rules/family/_childhasnameof.py
diff --git a/src/gen/filters/rules/family/_FamilyPrivate.py b/src/gen/filters/rules/family/_familyprivate.py
similarity index 100%
rename from src/gen/filters/rules/family/_FamilyPrivate.py
rename to src/gen/filters/rules/family/_familyprivate.py
diff --git a/src/gen/filters/rules/family/_FatherHasIdOf.py b/src/gen/filters/rules/family/_fatherhasidof.py
similarity index 100%
rename from src/gen/filters/rules/family/_FatherHasIdOf.py
rename to src/gen/filters/rules/family/_fatherhasidof.py
diff --git a/src/gen/filters/rules/family/_FatherHasNameOf.py b/src/gen/filters/rules/family/_fatherhasnameof.py
similarity index 100%
rename from src/gen/filters/rules/family/_FatherHasNameOf.py
rename to src/gen/filters/rules/family/_fatherhasnameof.py
diff --git a/src/gen/filters/rules/family/_HasAttribute.py b/src/gen/filters/rules/family/_hasattribute.py
similarity index 100%
rename from src/gen/filters/rules/family/_HasAttribute.py
rename to src/gen/filters/rules/family/_hasattribute.py
diff --git a/src/gen/filters/rules/family/_HasCitation.py b/src/gen/filters/rules/family/_hascitation.py
similarity index 100%
rename from src/gen/filters/rules/family/_HasCitation.py
rename to src/gen/filters/rules/family/_hascitation.py
diff --git a/src/gen/filters/rules/family/_HasEvent.py b/src/gen/filters/rules/family/_hasevent.py
similarity index 100%
rename from src/gen/filters/rules/family/_HasEvent.py
rename to src/gen/filters/rules/family/_hasevent.py
diff --git a/src/gen/filters/rules/family/_HasGallery.py b/src/gen/filters/rules/family/_hasgallery.py
similarity index 100%
rename from src/gen/filters/rules/family/_HasGallery.py
rename to src/gen/filters/rules/family/_hasgallery.py
diff --git a/src/gen/filters/rules/family/_HasIdOf.py b/src/gen/filters/rules/family/_hasidof.py
similarity index 100%
rename from src/gen/filters/rules/family/_HasIdOf.py
rename to src/gen/filters/rules/family/_hasidof.py
diff --git a/src/gen/filters/rules/family/_HasLDS.py b/src/gen/filters/rules/family/_haslds.py
similarity index 100%
rename from src/gen/filters/rules/family/_HasLDS.py
rename to src/gen/filters/rules/family/_haslds.py
diff --git a/src/gen/filters/rules/family/_HasNote.py b/src/gen/filters/rules/family/_hasnote.py
similarity index 100%
rename from src/gen/filters/rules/family/_HasNote.py
rename to src/gen/filters/rules/family/_hasnote.py
diff --git a/src/gen/filters/rules/family/_HasNoteMatchingSubstringOf.py b/src/gen/filters/rules/family/_hasnotematchingsubstringof.py
similarity index 100%
rename from src/gen/filters/rules/family/_HasNoteMatchingSubstringOf.py
rename to src/gen/filters/rules/family/_hasnotematchingsubstringof.py
diff --git a/src/gen/filters/rules/family/_HasNoteRegexp.py b/src/gen/filters/rules/family/_hasnoteregexp.py
similarity index 100%
rename from src/gen/filters/rules/family/_HasNoteRegexp.py
rename to src/gen/filters/rules/family/_hasnoteregexp.py
diff --git a/src/gen/filters/rules/family/_HasReferenceCountOf.py b/src/gen/filters/rules/family/_hasreferencecountof.py
similarity index 100%
rename from src/gen/filters/rules/family/_HasReferenceCountOf.py
rename to src/gen/filters/rules/family/_hasreferencecountof.py
diff --git a/src/gen/filters/rules/family/_HasRelType.py b/src/gen/filters/rules/family/_hasreltype.py
similarity index 100%
rename from src/gen/filters/rules/family/_HasRelType.py
rename to src/gen/filters/rules/family/_hasreltype.py
diff --git a/src/gen/filters/rules/family/_HasSourceCount.py b/src/gen/filters/rules/family/_hassourcecount.py
similarity index 100%
rename from src/gen/filters/rules/family/_HasSourceCount.py
rename to src/gen/filters/rules/family/_hassourcecount.py
diff --git a/src/gen/filters/rules/family/_HasTag.py b/src/gen/filters/rules/family/_hastag.py
similarity index 100%
rename from src/gen/filters/rules/family/_HasTag.py
rename to src/gen/filters/rules/family/_hastag.py
diff --git a/src/gen/filters/rules/family/_IsBookmarked.py b/src/gen/filters/rules/family/_isbookmarked.py
similarity index 100%
rename from src/gen/filters/rules/family/_IsBookmarked.py
rename to src/gen/filters/rules/family/_isbookmarked.py
diff --git a/src/gen/filters/rules/family/_MatchesFilter.py b/src/gen/filters/rules/family/_matchesfilter.py
similarity index 100%
rename from src/gen/filters/rules/family/_MatchesFilter.py
rename to src/gen/filters/rules/family/_matchesfilter.py
diff --git a/src/gen/filters/rules/family/_MatchesSourceConfidence.py b/src/gen/filters/rules/family/_matchessourceconfidence.py
similarity index 100%
rename from src/gen/filters/rules/family/_MatchesSourceConfidence.py
rename to src/gen/filters/rules/family/_matchessourceconfidence.py
diff --git a/src/gen/filters/rules/family/_MemberBase.py b/src/gen/filters/rules/family/_memberbase.py
similarity index 100%
rename from src/gen/filters/rules/family/_MemberBase.py
rename to src/gen/filters/rules/family/_memberbase.py
diff --git a/src/gen/filters/rules/family/_MotherHasIdOf.py b/src/gen/filters/rules/family/_motherhasidof.py
similarity index 100%
rename from src/gen/filters/rules/family/_MotherHasIdOf.py
rename to src/gen/filters/rules/family/_motherhasidof.py
diff --git a/src/gen/filters/rules/family/_MotherHasNameOf.py b/src/gen/filters/rules/family/_motherhasnameof.py
similarity index 100%
rename from src/gen/filters/rules/family/_MotherHasNameOf.py
rename to src/gen/filters/rules/family/_motherhasnameof.py
diff --git a/src/gen/filters/rules/family/_RegExpChildName.py b/src/gen/filters/rules/family/_regexpchildname.py
similarity index 100%
rename from src/gen/filters/rules/family/_RegExpChildName.py
rename to src/gen/filters/rules/family/_regexpchildname.py
diff --git a/src/gen/filters/rules/family/_RegExpFatherName.py b/src/gen/filters/rules/family/_regexpfathername.py
similarity index 100%
rename from src/gen/filters/rules/family/_RegExpFatherName.py
rename to src/gen/filters/rules/family/_regexpfathername.py
diff --git a/src/gen/filters/rules/family/_RegExpIdOf.py b/src/gen/filters/rules/family/_regexpidof.py
similarity index 100%
rename from src/gen/filters/rules/family/_RegExpIdOf.py
rename to src/gen/filters/rules/family/_regexpidof.py
diff --git a/src/gen/filters/rules/family/_RegExpMotherName.py b/src/gen/filters/rules/family/_regexpmothername.py
similarity index 100%
rename from src/gen/filters/rules/family/_RegExpMotherName.py
rename to src/gen/filters/rules/family/_regexpmothername.py
diff --git a/src/gen/filters/rules/family/_SearchChildName.py b/src/gen/filters/rules/family/_searchchildname.py
similarity index 100%
rename from src/gen/filters/rules/family/_SearchChildName.py
rename to src/gen/filters/rules/family/_searchchildname.py
diff --git a/src/gen/filters/rules/family/_SearchFatherName.py b/src/gen/filters/rules/family/_searchfathername.py
similarity index 100%
rename from src/gen/filters/rules/family/_SearchFatherName.py
rename to src/gen/filters/rules/family/_searchfathername.py
diff --git a/src/gen/filters/rules/family/_SearchMotherName.py b/src/gen/filters/rules/family/_searchmothername.py
similarity index 100%
rename from src/gen/filters/rules/family/_SearchMotherName.py
rename to src/gen/filters/rules/family/_searchmothername.py
diff --git a/src/gen/filters/rules/media/Makefile.am b/src/gen/filters/rules/media/Makefile.am
index 7bcb83861..71f445e3f 100644
--- a/src/gen/filters/rules/media/Makefile.am
+++ b/src/gen/filters/rules/media/Makefile.am
@@ -4,18 +4,18 @@
 pkgpythondir = $(datadir)/@PACKAGE@/gen/filters/rules/media
 
 pkgpython_PYTHON = \
-	_AllMedia.py\
-	_ChangedSince.py\
-	_HasIdOf.py\
-	_HasMedia.py\
-	_HasNoteMatchingSubstringOf.py\
-	_HasNoteRegexp.py\
-	_HasReferenceCountOf.py\
-	_HasTag.py\
-	_MatchesFilter.py\
-	_MediaPrivate.py\
-	_HasAttribute.py\
-	_RegExpIdOf.py\
+	_allmedia.py\
+	_changedsince.py\
+	_hasidof.py\
+	_hasmedia.py\
+	_hasnotematchingsubstringof.py\
+	_hasnoteregexp.py\
+	_hasreferencecountof.py\
+	_hastag.py\
+	_matchesfilter.py\
+	_mediaprivate.py\
+	_hasattribute.py\
+	_regexpidof.py\
 	__init__.py
 
 pkgpyexecdir = @pkgpyexecdir@/gen/filters/rules/media
diff --git a/src/gen/filters/rules/media/__init__.py b/src/gen/filters/rules/media/__init__.py
index 58c87d57e..bcb988abd 100644
--- a/src/gen/filters/rules/media/__init__.py
+++ b/src/gen/filters/rules/media/__init__.py
@@ -24,18 +24,18 @@
 Package providing filter rules for GRAMPS.
 """
 
-from _AllMedia import AllMedia
-from _HasIdOf import HasIdOf
-from _RegExpIdOf import RegExpIdOf
-from _HasNoteRegexp import HasNoteRegexp
-from _HasNoteMatchingSubstringOf import HasNoteMatchingSubstringOf
-from _HasReferenceCountOf import HasReferenceCountOf
-from _MediaPrivate import MediaPrivate
-from _MatchesFilter import MatchesFilter
-from _HasMedia import HasMedia
-from _HasAttribute import HasAttribute
-from _ChangedSince import ChangedSince
-from _HasTag import HasTag
+from _allmedia import AllMedia
+from _hasidof import HasIdOf
+from _regexpidof import RegExpIdOf
+from _hasnoteregexp import HasNoteRegexp
+from _hasnotematchingsubstringof import HasNoteMatchingSubstringOf
+from _hasreferencecountof import HasReferenceCountOf
+from _mediaprivate import MediaPrivate
+from _matchesfilter import MatchesFilter
+from _hasmedia import HasMedia
+from _hasattribute import HasAttribute
+from _changedsince import ChangedSince
+from _hastag import HasTag
 
 editor_rule_list = [
     AllMedia,
diff --git a/src/gen/filters/rules/media/_AllMedia.py b/src/gen/filters/rules/media/_allmedia.py
similarity index 100%
rename from src/gen/filters/rules/media/_AllMedia.py
rename to src/gen/filters/rules/media/_allmedia.py
diff --git a/src/gen/filters/rules/media/_ChangedSince.py b/src/gen/filters/rules/media/_changedsince.py
similarity index 100%
rename from src/gen/filters/rules/media/_ChangedSince.py
rename to src/gen/filters/rules/media/_changedsince.py
diff --git a/src/gen/filters/rules/media/_HasAttribute.py b/src/gen/filters/rules/media/_hasattribute.py
similarity index 100%
rename from src/gen/filters/rules/media/_HasAttribute.py
rename to src/gen/filters/rules/media/_hasattribute.py
diff --git a/src/gen/filters/rules/media/_HasIdOf.py b/src/gen/filters/rules/media/_hasidof.py
similarity index 100%
rename from src/gen/filters/rules/media/_HasIdOf.py
rename to src/gen/filters/rules/media/_hasidof.py
diff --git a/src/gen/filters/rules/media/_HasMedia.py b/src/gen/filters/rules/media/_hasmedia.py
similarity index 100%
rename from src/gen/filters/rules/media/_HasMedia.py
rename to src/gen/filters/rules/media/_hasmedia.py
diff --git a/src/gen/filters/rules/media/_HasNoteMatchingSubstringOf.py b/src/gen/filters/rules/media/_hasnotematchingsubstringof.py
similarity index 100%
rename from src/gen/filters/rules/media/_HasNoteMatchingSubstringOf.py
rename to src/gen/filters/rules/media/_hasnotematchingsubstringof.py
diff --git a/src/gen/filters/rules/media/_HasNoteRegexp.py b/src/gen/filters/rules/media/_hasnoteregexp.py
similarity index 100%
rename from src/gen/filters/rules/media/_HasNoteRegexp.py
rename to src/gen/filters/rules/media/_hasnoteregexp.py
diff --git a/src/gen/filters/rules/media/_HasReferenceCountOf.py b/src/gen/filters/rules/media/_hasreferencecountof.py
similarity index 100%
rename from src/gen/filters/rules/media/_HasReferenceCountOf.py
rename to src/gen/filters/rules/media/_hasreferencecountof.py
diff --git a/src/gen/filters/rules/media/_HasTag.py b/src/gen/filters/rules/media/_hastag.py
similarity index 100%
rename from src/gen/filters/rules/media/_HasTag.py
rename to src/gen/filters/rules/media/_hastag.py
diff --git a/src/gen/filters/rules/media/_MatchesFilter.py b/src/gen/filters/rules/media/_matchesfilter.py
similarity index 100%
rename from src/gen/filters/rules/media/_MatchesFilter.py
rename to src/gen/filters/rules/media/_matchesfilter.py
diff --git a/src/gen/filters/rules/media/_MediaPrivate.py b/src/gen/filters/rules/media/_mediaprivate.py
similarity index 100%
rename from src/gen/filters/rules/media/_MediaPrivate.py
rename to src/gen/filters/rules/media/_mediaprivate.py
diff --git a/src/gen/filters/rules/media/_RegExpIdOf.py b/src/gen/filters/rules/media/_regexpidof.py
similarity index 100%
rename from src/gen/filters/rules/media/_RegExpIdOf.py
rename to src/gen/filters/rules/media/_regexpidof.py
diff --git a/src/gen/filters/rules/note/Makefile.am b/src/gen/filters/rules/note/Makefile.am
index e3a57eb0a..1406945f7 100644
--- a/src/gen/filters/rules/note/Makefile.am
+++ b/src/gen/filters/rules/note/Makefile.am
@@ -4,17 +4,17 @@
 pkgpythondir = $(datadir)/@PACKAGE@/gen/filters/rules/note
 
 pkgpython_PYTHON = \
-	_AllNotes.py\
-	_ChangedSince.py\
-	_HasIdOf.py\
-	_MatchesSubstringOf.py\
-	_MatchesRegexpOf.py\
-	_HasNote.py\
-	_HasReferenceCountOf.py\
-	_HasTag.py\
-	_MatchesFilter.py\
-	_RegExpIdOf.py\
-	_NotePrivate.py\
+	_allnotes.py\
+	_changedsince.py\
+	_hasidof.py\
+	_matchessubstringof.py\
+	_matchesregexpof.py\
+	_hasnote.py\
+	_hasreferencecountof.py\
+	_hastag.py\
+	_matchesfilter.py\
+	_regexpidof.py\
+	_noteprivate.py\
 	__init__.py
 
 pkgpyexecdir = @pkgpyexecdir@/gen/filters/rules/note
diff --git a/src/gen/filters/rules/note/__init__.py b/src/gen/filters/rules/note/__init__.py
index fdb3772d4..627ffe237 100644
--- a/src/gen/filters/rules/note/__init__.py
+++ b/src/gen/filters/rules/note/__init__.py
@@ -25,17 +25,17 @@
 Package providing filter rules for GRAMPS.
 """
 
-from _AllNotes import AllNotes
-from _HasIdOf import HasIdOf
-from _RegExpIdOf import RegExpIdOf
-from _MatchesRegexpOf import MatchesRegexpOf
-from _MatchesSubstringOf import MatchesSubstringOf
-from _HasReferenceCountOf import HasReferenceCountOf
-from _NotePrivate import NotePrivate
-from _MatchesFilter import MatchesFilter
-from _HasNote import HasNote
-from _ChangedSince import ChangedSince
-from _HasTag import HasTag
+from _allnotes import AllNotes
+from _hasidof import HasIdOf
+from _regexpidof import RegExpIdOf
+from _matchesregexpof import MatchesRegexpOf
+from _matchessubstringof import MatchesSubstringOf
+from _hasreferencecountof import HasReferenceCountOf
+from _noteprivate import NotePrivate
+from _matchesfilter import MatchesFilter
+from _hasnote import HasNote
+from _changedsince import ChangedSince
+from _hastag import HasTag
 
 editor_rule_list = [
     AllNotes,
diff --git a/src/gen/filters/rules/note/_AllNotes.py b/src/gen/filters/rules/note/_allnotes.py
similarity index 100%
rename from src/gen/filters/rules/note/_AllNotes.py
rename to src/gen/filters/rules/note/_allnotes.py
diff --git a/src/gen/filters/rules/note/_ChangedSince.py b/src/gen/filters/rules/note/_changedsince.py
similarity index 100%
rename from src/gen/filters/rules/note/_ChangedSince.py
rename to src/gen/filters/rules/note/_changedsince.py
diff --git a/src/gen/filters/rules/note/_HasIdOf.py b/src/gen/filters/rules/note/_hasidof.py
similarity index 100%
rename from src/gen/filters/rules/note/_HasIdOf.py
rename to src/gen/filters/rules/note/_hasidof.py
diff --git a/src/gen/filters/rules/note/_HasNote.py b/src/gen/filters/rules/note/_hasnote.py
similarity index 100%
rename from src/gen/filters/rules/note/_HasNote.py
rename to src/gen/filters/rules/note/_hasnote.py
diff --git a/src/gen/filters/rules/note/_HasReferenceCountOf.py b/src/gen/filters/rules/note/_hasreferencecountof.py
similarity index 100%
rename from src/gen/filters/rules/note/_HasReferenceCountOf.py
rename to src/gen/filters/rules/note/_hasreferencecountof.py
diff --git a/src/gen/filters/rules/note/_HasTag.py b/src/gen/filters/rules/note/_hastag.py
similarity index 100%
rename from src/gen/filters/rules/note/_HasTag.py
rename to src/gen/filters/rules/note/_hastag.py
diff --git a/src/gen/filters/rules/note/_MatchesFilter.py b/src/gen/filters/rules/note/_matchesfilter.py
similarity index 100%
rename from src/gen/filters/rules/note/_MatchesFilter.py
rename to src/gen/filters/rules/note/_matchesfilter.py
diff --git a/src/gen/filters/rules/note/_MatchesRegexpOf.py b/src/gen/filters/rules/note/_matchesregexpof.py
similarity index 100%
rename from src/gen/filters/rules/note/_MatchesRegexpOf.py
rename to src/gen/filters/rules/note/_matchesregexpof.py
diff --git a/src/gen/filters/rules/note/_MatchesSubstringOf.py b/src/gen/filters/rules/note/_matchessubstringof.py
similarity index 100%
rename from src/gen/filters/rules/note/_MatchesSubstringOf.py
rename to src/gen/filters/rules/note/_matchessubstringof.py
diff --git a/src/gen/filters/rules/note/_NotePrivate.py b/src/gen/filters/rules/note/_noteprivate.py
similarity index 100%
rename from src/gen/filters/rules/note/_NotePrivate.py
rename to src/gen/filters/rules/note/_noteprivate.py
diff --git a/src/gen/filters/rules/note/_RegExpIdOf.py b/src/gen/filters/rules/note/_regexpidof.py
similarity index 100%
rename from src/gen/filters/rules/note/_RegExpIdOf.py
rename to src/gen/filters/rules/note/_regexpidof.py
diff --git a/src/gen/filters/rules/person/Makefile.am b/src/gen/filters/rules/person/Makefile.am
index eebb165c4..ddcfc2b29 100644
--- a/src/gen/filters/rules/person/Makefile.am
+++ b/src/gen/filters/rules/person/Makefile.am
@@ -4,84 +4,84 @@
 pkgpythondir = $(datadir)/@PACKAGE@/gen/filters/rules/person
 
 pkgpython_PYTHON = \
-	_ChangedSince.py\
-	_Disconnected.py \
-	_DeepRelationshipPathBetween.py \
-	_Everyone.py \
-	_FamilyWithIncompleteEvent.py \
-	_HasAttribute.py \
-	_HasAddress.py \
-	_HasAlternateName.py \
-	_HasAssociation.py \
-	_HasBirth.py \
-	_HasCitation.py \
-	_HasCommonAncestorWith.py \
-	_HasCommonAncestorWithFilterMatch.py \
-	_HasDeath.py \
-	_HasEvent.py \
-	_HasFamilyAttribute.py \
-	_HasFamilyEvent.py \
-	_HasGallery.py \
-	_HasIdOf.py \
-	_HasLDS.py \
-	_HasNameOf.py \
-	_HasNameOriginType.py \
-	_HasNameType.py \
-	_HasNickname.py \
-	_HasNote.py \
-	_HasNoteMatchingSubstringOf.py \
-	_HasRelationship.py \
-	_HasSourceCount.py \
-	_HasSourceOf.py \
-	_HasTag.py \
-	_HasTextMatchingRegexpOf.py \
-	_HasTextMatchingSubstringOf.py \
-	_HasUnknownGender.py \
-	_HaveAltFamilies.py \
-	_HaveChildren.py \
-	_IncompleteNames.py \
-	_IsAncestorOf.py \
-	_IsAncestorOfFilterMatch.py \
-	_IsBookmarked.py \
-	_IsChildOfFilterMatch.py \
-	_IsDefaultPerson.py \
-	_IsDescendantFamilyOf.py \
-        _IsDescendantFamilyOfFilterMatch.py \
-	_IsDescendantOf.py \
-	_IsDescendantOfFilterMatch.py \
-	_IsDuplicatedAncestorOf.py \
-	_IsFemale.py \
-	_IsLessThanNthGenerationAncestorOf.py \
-	_IsLessThanNthGenerationAncestorOfBookmarked.py \
-	_IsLessThanNthGenerationAncestorOfDefaultPerson.py \
-	_IsLessThanNthGenerationDescendantOf.py \
-	_IsMale.py \
-	_IsMoreThanNthGenerationAncestorOf.py \
-	_IsMoreThanNthGenerationDescendantOf.py \
-	_IsParentOfFilterMatch.py \
-        _IsRelatedWith.py \
-	_IsSiblingOfFilterMatch.py \
-	_IsSpouseOfFilterMatch.py \
-	_IsWitness.py \
-	_MatchesFilter.py \
-	_MatchesEventFilter.py \
-        _MatchesSourceConfidence.py \
-	_MissingParent.py \
-	_MultipleMarriages.py \
-	_NeverMarried.py \
-	_NoBirthdate.py \
-        _NoDeathdate.py \
-	_PeoplePrivate.py \
-        _PeoplePublic.py \
-	_PersonWithIncompleteEvent.py \
-	_ProbablyAlive.py \
-	_RelationshipPathBetween.py \
-	_RelationshipPathBetweenBookmarks.py \
-	_SearchName.py \
-	_RegExpIdOf.py \
-	_MatchIdOf.py \
-	_HasNoteRegexp.py \
-	_RegExpName.py \
+	_changedsince.py\
+	_disconnected.py \
+	_deeprelationshippathbetween.py \
+	_everyone.py \
+	_familywithincompleteevent.py \
+	_hasattribute.py \
+	_hasaddress.py \
+	_hasalternatename.py \
+	_hasassociation.py \
+	_hasbirth.py \
+	_hascitation.py \
+	_hascommonancestorwith.py \
+	_hascommonancestorwithfiltermatch.py \
+	_hasdeath.py \
+	_hasevent.py \
+	_hasfamilyattribute.py \
+	_hasfamilyevent.py \
+	_hasgallery.py \
+	_hasidof.py \
+	_haslds.py \
+	_hasnameof.py \
+	_hasnameorigintype.py \
+	_hasnametype.py \
+	_hasnickname.py \
+	_hasnote.py \
+	_hasnotematchingsubstringof.py \
+	_hasrelationship.py \
+	_hassourcecount.py \
+	_hassourceof.py \
+	_hastag.py \
+	_hastextmatchingregexpof.py \
+	_hastextmatchingsubstringof.py \
+	_hasunknowngender.py \
+	_havealtfamilies.py \
+	_havechildren.py \
+	_incompletenames.py \
+	_isancestorof.py \
+	_isancestoroffiltermatch.py \
+	_isbookmarked.py \
+	_ischildoffiltermatch.py \
+	_isdefaultperson.py \
+	_isdescendantfamilyof.py \
+        _isdescendantfamilyoffiltermatch.py \
+	_isdescendantof.py \
+	_isdescendantoffiltermatch.py \
+	_isduplicatedancestorof.py \
+	_isfemale.py \
+	_islessthannthgenerationancestorof.py \
+	_islessthannthgenerationancestorofbookmarked.py \
+	_islessthannthgenerationancestorofdefaultperson.py \
+	_islessthannthgenerationdescendantof.py \
+	_ismale.py \
+	_ismorethannthgenerationancestorof.py \
+	_ismorethannthgenerationdescendantof.py \
+	_isparentoffiltermatch.py \
+        _isrelatedwith.py \
+	_issiblingoffiltermatch.py \
+	_isspouseoffiltermatch.py \
+	_iswitness.py \
+	_matchesfilter.py \
+	_matcheseventfilter.py \
+        _matchessourceconfidence.py \
+	_missingparent.py \
+	_multiplemarriages.py \
+	_nevermarried.py \
+	_nobirthdate.py \
+        _nodeathdate.py \
+	_peopleprivate.py \
+        _peoplepublic.py \
+	_personwithincompleteevent.py \
+	_probablyalive.py \
+	_relationshippathbetween.py \
+	_relationshippathbetweenbookmarks.py \
+	_searchname.py \
+	_regexpidof.py \
+	_matchidof.py \
+	_hasnoteregexp.py \
+	_regexpname.py \
 	__init__.py
 
 pkgpyexecdir = @pkgpyexecdir@/gen/filters/rules/person
diff --git a/src/gen/filters/rules/person/__init__.py b/src/gen/filters/rules/person/__init__.py
index f9f79c76e..64b1e5611 100644
--- a/src/gen/filters/rules/person/__init__.py
+++ b/src/gen/filters/rules/person/__init__.py
@@ -27,90 +27,90 @@
 Package providing filter rules for GRAMPS.
 """
 
-from _Disconnected import Disconnected
-from _Everyone import Everyone
-from _FamilyWithIncompleteEvent import FamilyWithIncompleteEvent
-from _HasAddress import HasAddress
-from _HasAlternateName import HasAlternateName
-from _HasAssociation import HasAssociation
-from _HasAttribute import HasAttribute
-from _HasBirth import HasBirth
-from _HasCitation import HasCitation
-from _HasCommonAncestorWith import HasCommonAncestorWith
-from _HasCommonAncestorWithFilterMatch import HasCommonAncestorWithFilterMatch
-from _HasDeath import HasDeath
-from _HasEvent import HasEvent
-from _HasFamilyAttribute import HasFamilyAttribute
-from _HasFamilyEvent import HasFamilyEvent
-from _HasGallery import HavePhotos
-from _HasIdOf import HasIdOf
-from _HasLDS import HasLDS
-from _HasNameOf import HasNameOf
-from _HasNameOriginType import HasNameOriginType
-from _HasNameType import HasNameType
-from _HasNickname import HasNickname
-from _HasNote import HasNote
-from _HasNoteMatchingSubstringOf import HasNoteMatchingSubstringOf
-from _HasNoteRegexp import HasNoteRegexp
-from _HasRelationship import HasRelationship
-from _HasSourceCount import HasSourceCount
-from _HasSourceOf import HasSourceOf
-from _HasTag import HasTag
-from _HasTextMatchingRegexpOf import HasTextMatchingRegexpOf
-from _HasTextMatchingSubstringOf import HasTextMatchingSubstringOf
-from _HasUnknownGender import HasUnknownGender
-from _HaveAltFamilies import HaveAltFamilies
-from _HaveChildren import HaveChildren
-from _IncompleteNames import IncompleteNames
-from _IsAncestorOf import IsAncestorOf
-from _IsAncestorOfFilterMatch import IsAncestorOfFilterMatch
-from _IsBookmarked import IsBookmarked
-from _IsChildOfFilterMatch import IsChildOfFilterMatch
-from _IsDefaultPerson import IsDefaultPerson
-from _IsDescendantFamilyOf import IsDescendantFamilyOf
-from _IsDescendantFamilyOfFilterMatch import IsDescendantFamilyOfFilterMatch
-from _IsDescendantOf import IsDescendantOf
-from _IsDescendantOfFilterMatch import IsDescendantOfFilterMatch
-from _IsDuplicatedAncestorOf import IsDuplicatedAncestorOf
-from _IsFemale import IsFemale
-from _IsLessThanNthGenerationAncestorOf import \
+from _disconnected import Disconnected
+from _everyone import Everyone
+from _familywithincompleteevent import FamilyWithIncompleteEvent
+from _hasaddress import HasAddress
+from _hasalternatename import HasAlternateName
+from _hasassociation import HasAssociation
+from _hasattribute import HasAttribute
+from _hasbirth import HasBirth
+from _hascitation import HasCitation
+from _hascommonancestorwith import HasCommonAncestorWith
+from _hascommonancestorwithfiltermatch import HasCommonAncestorWithFilterMatch
+from _hasdeath import HasDeath
+from _hasevent import HasEvent
+from _hasfamilyattribute import HasFamilyAttribute
+from _hasfamilyevent import HasFamilyEvent
+from _hasgallery import HavePhotos
+from _hasidof import HasIdOf
+from _haslds import HasLDS
+from _hasnameof import HasNameOf
+from _hasnameorigintype import HasNameOriginType
+from _hasnametype import HasNameType
+from _hasnickname import HasNickname
+from _hasnote import HasNote
+from _hasnotematchingsubstringof import HasNoteMatchingSubstringOf
+from _hasnoteregexp import HasNoteRegexp
+from _hasrelationship import HasRelationship
+from _hassourcecount import HasSourceCount
+from _hassourceof import HasSourceOf
+from _hastag import HasTag
+from _hastextmatchingregexpof import HasTextMatchingRegexpOf
+from _hastextmatchingsubstringof import HasTextMatchingSubstringOf
+from _hasunknowngender import HasUnknownGender
+from _havealtfamilies import HaveAltFamilies
+from _havechildren import HaveChildren
+from _incompletenames import IncompleteNames
+from _isancestorof import IsAncestorOf
+from _isancestoroffiltermatch import IsAncestorOfFilterMatch
+from _isbookmarked import IsBookmarked
+from _ischildoffiltermatch import IsChildOfFilterMatch
+from _isdefaultperson import IsDefaultPerson
+from _isdescendantfamilyof import IsDescendantFamilyOf
+from _isdescendantfamilyoffiltermatch import IsDescendantFamilyOfFilterMatch
+from _isdescendantof import IsDescendantOf
+from _isdescendantoffiltermatch import IsDescendantOfFilterMatch
+from _isduplicatedancestorof import IsDuplicatedAncestorOf
+from _isfemale import IsFemale
+from _islessthannthgenerationancestorof import \
      IsLessThanNthGenerationAncestorOf
-from _IsLessThanNthGenerationAncestorOfBookmarked import \
+from _islessthannthgenerationancestorofbookmarked import \
      IsLessThanNthGenerationAncestorOfBookmarked
-from _IsLessThanNthGenerationAncestorOfDefaultPerson import \
+from _islessthannthgenerationancestorofdefaultperson import \
      IsLessThanNthGenerationAncestorOfDefaultPerson
-from _IsLessThanNthGenerationDescendantOf import \
+from _islessthannthgenerationdescendantof import \
      IsLessThanNthGenerationDescendantOf
-from _IsMale import IsMale
-from _IsMoreThanNthGenerationAncestorOf import \
+from _ismale import IsMale
+from _ismorethannthgenerationancestorof import \
      IsMoreThanNthGenerationAncestorOf
-from _IsMoreThanNthGenerationDescendantOf import \
+from _ismorethannthgenerationdescendantof import \
      IsMoreThanNthGenerationDescendantOf
-from _IsParentOfFilterMatch import IsParentOfFilterMatch
-from _IsSiblingOfFilterMatch import IsSiblingOfFilterMatch
-from _IsSpouseOfFilterMatch import IsSpouseOfFilterMatch
-from _IsWitness import IsWitness
-from _MatchesFilter import MatchesFilter
-from _MatchesEventFilter import MatchesEventFilter
-from _MatchesSourceConfidence import MatchesSourceConfidence
-from _MissingParent import MissingParent
-from _MultipleMarriages import MultipleMarriages
-from _NeverMarried import NeverMarried
-from _NoBirthdate import NoBirthdate
-from _NoDeathdate import NoDeathdate
-from _PeoplePrivate import PeoplePrivate
-from _PeoplePublic import PeoplePublic
-from _PersonWithIncompleteEvent import PersonWithIncompleteEvent
-from _ProbablyAlive import ProbablyAlive
-from _RelationshipPathBetween import RelationshipPathBetween
-from _DeepRelationshipPathBetween import DeepRelationshipPathBetween
-from _RelationshipPathBetweenBookmarks import RelationshipPathBetweenBookmarks
-from _SearchName import SearchName
-from _RegExpName import RegExpName
-from _MatchIdOf import MatchIdOf
-from _RegExpIdOf import RegExpIdOf
-from _ChangedSince import ChangedSince
-from _IsRelatedWith import IsRelatedWith
+from _isparentoffiltermatch import IsParentOfFilterMatch
+from _issiblingoffiltermatch import IsSiblingOfFilterMatch
+from _isspouseoffiltermatch import IsSpouseOfFilterMatch
+from _iswitness import IsWitness
+from _matchesfilter import MatchesFilter
+from _matcheseventfilter import MatchesEventFilter
+from _matchessourceconfidence import MatchesSourceConfidence
+from _missingparent import MissingParent
+from _multiplemarriages import MultipleMarriages
+from _nevermarried import NeverMarried
+from _nobirthdate import NoBirthdate
+from _nodeathdate import NoDeathdate
+from _peopleprivate import PeoplePrivate
+from _peoplepublic import PeoplePublic
+from _personwithincompleteevent import PersonWithIncompleteEvent
+from _probablyalive import ProbablyAlive
+from _relationshippathbetween import RelationshipPathBetween
+from _deeprelationshippathbetween import DeepRelationshipPathBetween
+from _relationshippathbetweenbookmarks import RelationshipPathBetweenBookmarks
+from _searchname import SearchName
+from _regexpname import RegExpName
+from _matchidof import MatchIdOf
+from _regexpidof import RegExpIdOf
+from _changedsince import ChangedSince
+from _isrelatedwith import IsRelatedWith
 
 #-------------------------------------------------------------------------
 #
diff --git a/src/gen/filters/rules/person/_ChangedSince.py b/src/gen/filters/rules/person/_changedsince.py
similarity index 100%
rename from src/gen/filters/rules/person/_ChangedSince.py
rename to src/gen/filters/rules/person/_changedsince.py
diff --git a/src/gen/filters/rules/person/_DeepRelationshipPathBetween.py b/src/gen/filters/rules/person/_deeprelationshippathbetween.py
similarity index 100%
rename from src/gen/filters/rules/person/_DeepRelationshipPathBetween.py
rename to src/gen/filters/rules/person/_deeprelationshippathbetween.py
diff --git a/src/gen/filters/rules/person/_Disconnected.py b/src/gen/filters/rules/person/_disconnected.py
similarity index 100%
rename from src/gen/filters/rules/person/_Disconnected.py
rename to src/gen/filters/rules/person/_disconnected.py
diff --git a/src/gen/filters/rules/person/_Everyone.py b/src/gen/filters/rules/person/_everyone.py
similarity index 100%
rename from src/gen/filters/rules/person/_Everyone.py
rename to src/gen/filters/rules/person/_everyone.py
diff --git a/src/gen/filters/rules/person/_FamilyWithIncompleteEvent.py b/src/gen/filters/rules/person/_familywithincompleteevent.py
similarity index 100%
rename from src/gen/filters/rules/person/_FamilyWithIncompleteEvent.py
rename to src/gen/filters/rules/person/_familywithincompleteevent.py
diff --git a/src/gen/filters/rules/person/_HasAddress.py b/src/gen/filters/rules/person/_hasaddress.py
similarity index 100%
rename from src/gen/filters/rules/person/_HasAddress.py
rename to src/gen/filters/rules/person/_hasaddress.py
diff --git a/src/gen/filters/rules/person/_HasAlternateName.py b/src/gen/filters/rules/person/_hasalternatename.py
similarity index 100%
rename from src/gen/filters/rules/person/_HasAlternateName.py
rename to src/gen/filters/rules/person/_hasalternatename.py
diff --git a/src/gen/filters/rules/person/_HasAssociation.py b/src/gen/filters/rules/person/_hasassociation.py
similarity index 100%
rename from src/gen/filters/rules/person/_HasAssociation.py
rename to src/gen/filters/rules/person/_hasassociation.py
diff --git a/src/gen/filters/rules/person/_HasAttribute.py b/src/gen/filters/rules/person/_hasattribute.py
similarity index 100%
rename from src/gen/filters/rules/person/_HasAttribute.py
rename to src/gen/filters/rules/person/_hasattribute.py
diff --git a/src/gen/filters/rules/person/_HasBirth.py b/src/gen/filters/rules/person/_hasbirth.py
similarity index 100%
rename from src/gen/filters/rules/person/_HasBirth.py
rename to src/gen/filters/rules/person/_hasbirth.py
diff --git a/src/gen/filters/rules/person/_HasCitation.py b/src/gen/filters/rules/person/_hascitation.py
similarity index 100%
rename from src/gen/filters/rules/person/_HasCitation.py
rename to src/gen/filters/rules/person/_hascitation.py
diff --git a/src/gen/filters/rules/person/_HasCommonAncestorWith.py b/src/gen/filters/rules/person/_hascommonancestorwith.py
similarity index 100%
rename from src/gen/filters/rules/person/_HasCommonAncestorWith.py
rename to src/gen/filters/rules/person/_hascommonancestorwith.py
diff --git a/src/gen/filters/rules/person/_HasCommonAncestorWithFilterMatch.py b/src/gen/filters/rules/person/_hascommonancestorwithfiltermatch.py
similarity index 100%
rename from src/gen/filters/rules/person/_HasCommonAncestorWithFilterMatch.py
rename to src/gen/filters/rules/person/_hascommonancestorwithfiltermatch.py
diff --git a/src/gen/filters/rules/person/_HasDeath.py b/src/gen/filters/rules/person/_hasdeath.py
similarity index 100%
rename from src/gen/filters/rules/person/_HasDeath.py
rename to src/gen/filters/rules/person/_hasdeath.py
diff --git a/src/gen/filters/rules/person/_HasEvent.py b/src/gen/filters/rules/person/_hasevent.py
similarity index 100%
rename from src/gen/filters/rules/person/_HasEvent.py
rename to src/gen/filters/rules/person/_hasevent.py
diff --git a/src/gen/filters/rules/person/_HasFamilyAttribute.py b/src/gen/filters/rules/person/_hasfamilyattribute.py
similarity index 100%
rename from src/gen/filters/rules/person/_HasFamilyAttribute.py
rename to src/gen/filters/rules/person/_hasfamilyattribute.py
diff --git a/src/gen/filters/rules/person/_HasFamilyEvent.py b/src/gen/filters/rules/person/_hasfamilyevent.py
similarity index 100%
rename from src/gen/filters/rules/person/_HasFamilyEvent.py
rename to src/gen/filters/rules/person/_hasfamilyevent.py
diff --git a/src/gen/filters/rules/person/_HasGallery.py b/src/gen/filters/rules/person/_hasgallery.py
similarity index 100%
rename from src/gen/filters/rules/person/_HasGallery.py
rename to src/gen/filters/rules/person/_hasgallery.py
diff --git a/src/gen/filters/rules/person/_HasIdOf.py b/src/gen/filters/rules/person/_hasidof.py
similarity index 100%
rename from src/gen/filters/rules/person/_HasIdOf.py
rename to src/gen/filters/rules/person/_hasidof.py
diff --git a/src/gen/filters/rules/person/_HasLDS.py b/src/gen/filters/rules/person/_haslds.py
similarity index 100%
rename from src/gen/filters/rules/person/_HasLDS.py
rename to src/gen/filters/rules/person/_haslds.py
diff --git a/src/gen/filters/rules/person/_HasNameOf.py b/src/gen/filters/rules/person/_hasnameof.py
similarity index 100%
rename from src/gen/filters/rules/person/_HasNameOf.py
rename to src/gen/filters/rules/person/_hasnameof.py
diff --git a/src/gen/filters/rules/person/_HasNameOriginType.py b/src/gen/filters/rules/person/_hasnameorigintype.py
similarity index 100%
rename from src/gen/filters/rules/person/_HasNameOriginType.py
rename to src/gen/filters/rules/person/_hasnameorigintype.py
diff --git a/src/gen/filters/rules/person/_HasNameType.py b/src/gen/filters/rules/person/_hasnametype.py
similarity index 100%
rename from src/gen/filters/rules/person/_HasNameType.py
rename to src/gen/filters/rules/person/_hasnametype.py
diff --git a/src/gen/filters/rules/person/_HasNickname.py b/src/gen/filters/rules/person/_hasnickname.py
similarity index 100%
rename from src/gen/filters/rules/person/_HasNickname.py
rename to src/gen/filters/rules/person/_hasnickname.py
diff --git a/src/gen/filters/rules/person/_HasNote.py b/src/gen/filters/rules/person/_hasnote.py
similarity index 100%
rename from src/gen/filters/rules/person/_HasNote.py
rename to src/gen/filters/rules/person/_hasnote.py
diff --git a/src/gen/filters/rules/person/_HasNoteMatchingSubstringOf.py b/src/gen/filters/rules/person/_hasnotematchingsubstringof.py
similarity index 100%
rename from src/gen/filters/rules/person/_HasNoteMatchingSubstringOf.py
rename to src/gen/filters/rules/person/_hasnotematchingsubstringof.py
diff --git a/src/gen/filters/rules/person/_HasNoteRegexp.py b/src/gen/filters/rules/person/_hasnoteregexp.py
similarity index 100%
rename from src/gen/filters/rules/person/_HasNoteRegexp.py
rename to src/gen/filters/rules/person/_hasnoteregexp.py
diff --git a/src/gen/filters/rules/person/_HasRelationship.py b/src/gen/filters/rules/person/_hasrelationship.py
similarity index 100%
rename from src/gen/filters/rules/person/_HasRelationship.py
rename to src/gen/filters/rules/person/_hasrelationship.py
diff --git a/src/gen/filters/rules/person/_HasSourceCount.py b/src/gen/filters/rules/person/_hassourcecount.py
similarity index 100%
rename from src/gen/filters/rules/person/_HasSourceCount.py
rename to src/gen/filters/rules/person/_hassourcecount.py
diff --git a/src/gen/filters/rules/person/_HasSourceOf.py b/src/gen/filters/rules/person/_hassourceof.py
similarity index 100%
rename from src/gen/filters/rules/person/_HasSourceOf.py
rename to src/gen/filters/rules/person/_hassourceof.py
diff --git a/src/gen/filters/rules/person/_HasTag.py b/src/gen/filters/rules/person/_hastag.py
similarity index 100%
rename from src/gen/filters/rules/person/_HasTag.py
rename to src/gen/filters/rules/person/_hastag.py
diff --git a/src/gen/filters/rules/person/_HasTextMatchingRegexpOf.py b/src/gen/filters/rules/person/_hastextmatchingregexpof.py
similarity index 100%
rename from src/gen/filters/rules/person/_HasTextMatchingRegexpOf.py
rename to src/gen/filters/rules/person/_hastextmatchingregexpof.py
diff --git a/src/gen/filters/rules/person/_HasTextMatchingSubstringOf.py b/src/gen/filters/rules/person/_hastextmatchingsubstringof.py
similarity index 100%
rename from src/gen/filters/rules/person/_HasTextMatchingSubstringOf.py
rename to src/gen/filters/rules/person/_hastextmatchingsubstringof.py
diff --git a/src/gen/filters/rules/person/_HasUnknownGender.py b/src/gen/filters/rules/person/_hasunknowngender.py
similarity index 100%
rename from src/gen/filters/rules/person/_HasUnknownGender.py
rename to src/gen/filters/rules/person/_hasunknowngender.py
diff --git a/src/gen/filters/rules/person/_HaveAltFamilies.py b/src/gen/filters/rules/person/_havealtfamilies.py
similarity index 100%
rename from src/gen/filters/rules/person/_HaveAltFamilies.py
rename to src/gen/filters/rules/person/_havealtfamilies.py
diff --git a/src/gen/filters/rules/person/_HaveChildren.py b/src/gen/filters/rules/person/_havechildren.py
similarity index 100%
rename from src/gen/filters/rules/person/_HaveChildren.py
rename to src/gen/filters/rules/person/_havechildren.py
diff --git a/src/gen/filters/rules/person/_IncompleteNames.py b/src/gen/filters/rules/person/_incompletenames.py
similarity index 100%
rename from src/gen/filters/rules/person/_IncompleteNames.py
rename to src/gen/filters/rules/person/_incompletenames.py
diff --git a/src/gen/filters/rules/person/_IsAncestorOf.py b/src/gen/filters/rules/person/_isancestorof.py
similarity index 100%
rename from src/gen/filters/rules/person/_IsAncestorOf.py
rename to src/gen/filters/rules/person/_isancestorof.py
diff --git a/src/gen/filters/rules/person/_IsAncestorOfFilterMatch.py b/src/gen/filters/rules/person/_isancestoroffiltermatch.py
similarity index 100%
rename from src/gen/filters/rules/person/_IsAncestorOfFilterMatch.py
rename to src/gen/filters/rules/person/_isancestoroffiltermatch.py
diff --git a/src/gen/filters/rules/person/_IsBookmarked.py b/src/gen/filters/rules/person/_isbookmarked.py
similarity index 100%
rename from src/gen/filters/rules/person/_IsBookmarked.py
rename to src/gen/filters/rules/person/_isbookmarked.py
diff --git a/src/gen/filters/rules/person/_IsChildOfFilterMatch.py b/src/gen/filters/rules/person/_ischildoffiltermatch.py
similarity index 100%
rename from src/gen/filters/rules/person/_IsChildOfFilterMatch.py
rename to src/gen/filters/rules/person/_ischildoffiltermatch.py
diff --git a/src/gen/filters/rules/person/_IsDefaultPerson.py b/src/gen/filters/rules/person/_isdefaultperson.py
similarity index 100%
rename from src/gen/filters/rules/person/_IsDefaultPerson.py
rename to src/gen/filters/rules/person/_isdefaultperson.py
diff --git a/src/gen/filters/rules/person/_IsDescendantFamilyOf.py b/src/gen/filters/rules/person/_isdescendantfamilyof.py
similarity index 100%
rename from src/gen/filters/rules/person/_IsDescendantFamilyOf.py
rename to src/gen/filters/rules/person/_isdescendantfamilyof.py
diff --git a/src/gen/filters/rules/person/_IsDescendantFamilyOfFilterMatch.py b/src/gen/filters/rules/person/_isdescendantfamilyoffiltermatch.py
similarity index 100%
rename from src/gen/filters/rules/person/_IsDescendantFamilyOfFilterMatch.py
rename to src/gen/filters/rules/person/_isdescendantfamilyoffiltermatch.py
diff --git a/src/gen/filters/rules/person/_IsDescendantOf.py b/src/gen/filters/rules/person/_isdescendantof.py
similarity index 100%
rename from src/gen/filters/rules/person/_IsDescendantOf.py
rename to src/gen/filters/rules/person/_isdescendantof.py
diff --git a/src/gen/filters/rules/person/_IsDescendantOfFilterMatch.py b/src/gen/filters/rules/person/_isdescendantoffiltermatch.py
similarity index 100%
rename from src/gen/filters/rules/person/_IsDescendantOfFilterMatch.py
rename to src/gen/filters/rules/person/_isdescendantoffiltermatch.py
diff --git a/src/gen/filters/rules/person/_IsDuplicatedAncestorOf.py b/src/gen/filters/rules/person/_isduplicatedancestorof.py
similarity index 100%
rename from src/gen/filters/rules/person/_IsDuplicatedAncestorOf.py
rename to src/gen/filters/rules/person/_isduplicatedancestorof.py
diff --git a/src/gen/filters/rules/person/_IsFemale.py b/src/gen/filters/rules/person/_isfemale.py
similarity index 100%
rename from src/gen/filters/rules/person/_IsFemale.py
rename to src/gen/filters/rules/person/_isfemale.py
diff --git a/src/gen/filters/rules/person/_IsLessThanNthGenerationAncestorOf.py b/src/gen/filters/rules/person/_islessthannthgenerationancestorof.py
similarity index 100%
rename from src/gen/filters/rules/person/_IsLessThanNthGenerationAncestorOf.py
rename to src/gen/filters/rules/person/_islessthannthgenerationancestorof.py
diff --git a/src/gen/filters/rules/person/_IsLessThanNthGenerationAncestorOfBookmarked.py b/src/gen/filters/rules/person/_islessthannthgenerationancestorofbookmarked.py
similarity index 100%
rename from src/gen/filters/rules/person/_IsLessThanNthGenerationAncestorOfBookmarked.py
rename to src/gen/filters/rules/person/_islessthannthgenerationancestorofbookmarked.py
diff --git a/src/gen/filters/rules/person/_IsLessThanNthGenerationAncestorOfDefaultPerson.py b/src/gen/filters/rules/person/_islessthannthgenerationancestorofdefaultperson.py
similarity index 100%
rename from src/gen/filters/rules/person/_IsLessThanNthGenerationAncestorOfDefaultPerson.py
rename to src/gen/filters/rules/person/_islessthannthgenerationancestorofdefaultperson.py
diff --git a/src/gen/filters/rules/person/_IsLessThanNthGenerationDescendantOf.py b/src/gen/filters/rules/person/_islessthannthgenerationdescendantof.py
similarity index 100%
rename from src/gen/filters/rules/person/_IsLessThanNthGenerationDescendantOf.py
rename to src/gen/filters/rules/person/_islessthannthgenerationdescendantof.py
diff --git a/src/gen/filters/rules/person/_IsMale.py b/src/gen/filters/rules/person/_ismale.py
similarity index 100%
rename from src/gen/filters/rules/person/_IsMale.py
rename to src/gen/filters/rules/person/_ismale.py
diff --git a/src/gen/filters/rules/person/_IsMoreThanNthGenerationAncestorOf.py b/src/gen/filters/rules/person/_ismorethannthgenerationancestorof.py
similarity index 100%
rename from src/gen/filters/rules/person/_IsMoreThanNthGenerationAncestorOf.py
rename to src/gen/filters/rules/person/_ismorethannthgenerationancestorof.py
diff --git a/src/gen/filters/rules/person/_IsMoreThanNthGenerationDescendantOf.py b/src/gen/filters/rules/person/_ismorethannthgenerationdescendantof.py
similarity index 100%
rename from src/gen/filters/rules/person/_IsMoreThanNthGenerationDescendantOf.py
rename to src/gen/filters/rules/person/_ismorethannthgenerationdescendantof.py
diff --git a/src/gen/filters/rules/person/_IsParentOfFilterMatch.py b/src/gen/filters/rules/person/_isparentoffiltermatch.py
similarity index 100%
rename from src/gen/filters/rules/person/_IsParentOfFilterMatch.py
rename to src/gen/filters/rules/person/_isparentoffiltermatch.py
diff --git a/src/gen/filters/rules/person/_IsRelatedWith.py b/src/gen/filters/rules/person/_isrelatedwith.py
similarity index 100%
rename from src/gen/filters/rules/person/_IsRelatedWith.py
rename to src/gen/filters/rules/person/_isrelatedwith.py
diff --git a/src/gen/filters/rules/person/_IsSiblingOfFilterMatch.py b/src/gen/filters/rules/person/_issiblingoffiltermatch.py
similarity index 100%
rename from src/gen/filters/rules/person/_IsSiblingOfFilterMatch.py
rename to src/gen/filters/rules/person/_issiblingoffiltermatch.py
diff --git a/src/gen/filters/rules/person/_IsSpouseOfFilterMatch.py b/src/gen/filters/rules/person/_isspouseoffiltermatch.py
similarity index 100%
rename from src/gen/filters/rules/person/_IsSpouseOfFilterMatch.py
rename to src/gen/filters/rules/person/_isspouseoffiltermatch.py
diff --git a/src/gen/filters/rules/person/_IsWitness.py b/src/gen/filters/rules/person/_iswitness.py
similarity index 100%
rename from src/gen/filters/rules/person/_IsWitness.py
rename to src/gen/filters/rules/person/_iswitness.py
diff --git a/src/gen/filters/rules/person/_MatchesEventFilter.py b/src/gen/filters/rules/person/_matcheseventfilter.py
similarity index 100%
rename from src/gen/filters/rules/person/_MatchesEventFilter.py
rename to src/gen/filters/rules/person/_matcheseventfilter.py
diff --git a/src/gen/filters/rules/person/_MatchesFilter.py b/src/gen/filters/rules/person/_matchesfilter.py
similarity index 100%
rename from src/gen/filters/rules/person/_MatchesFilter.py
rename to src/gen/filters/rules/person/_matchesfilter.py
diff --git a/src/gen/filters/rules/person/_MatchesSourceConfidence.py b/src/gen/filters/rules/person/_matchessourceconfidence.py
similarity index 100%
rename from src/gen/filters/rules/person/_MatchesSourceConfidence.py
rename to src/gen/filters/rules/person/_matchessourceconfidence.py
diff --git a/src/gen/filters/rules/person/_MatchIdOf.py b/src/gen/filters/rules/person/_matchidof.py
similarity index 100%
rename from src/gen/filters/rules/person/_MatchIdOf.py
rename to src/gen/filters/rules/person/_matchidof.py
diff --git a/src/gen/filters/rules/person/_MissingParent.py b/src/gen/filters/rules/person/_missingparent.py
similarity index 100%
rename from src/gen/filters/rules/person/_MissingParent.py
rename to src/gen/filters/rules/person/_missingparent.py
diff --git a/src/gen/filters/rules/person/_MultipleMarriages.py b/src/gen/filters/rules/person/_multiplemarriages.py
similarity index 100%
rename from src/gen/filters/rules/person/_MultipleMarriages.py
rename to src/gen/filters/rules/person/_multiplemarriages.py
diff --git a/src/gen/filters/rules/person/_NeverMarried.py b/src/gen/filters/rules/person/_nevermarried.py
similarity index 100%
rename from src/gen/filters/rules/person/_NeverMarried.py
rename to src/gen/filters/rules/person/_nevermarried.py
diff --git a/src/gen/filters/rules/person/_NoBirthdate.py b/src/gen/filters/rules/person/_nobirthdate.py
similarity index 100%
rename from src/gen/filters/rules/person/_NoBirthdate.py
rename to src/gen/filters/rules/person/_nobirthdate.py
diff --git a/src/gen/filters/rules/person/_NoDeathdate.py b/src/gen/filters/rules/person/_nodeathdate.py
similarity index 100%
rename from src/gen/filters/rules/person/_NoDeathdate.py
rename to src/gen/filters/rules/person/_nodeathdate.py
diff --git a/src/gen/filters/rules/person/_PeoplePrivate.py b/src/gen/filters/rules/person/_peopleprivate.py
similarity index 100%
rename from src/gen/filters/rules/person/_PeoplePrivate.py
rename to src/gen/filters/rules/person/_peopleprivate.py
diff --git a/src/gen/filters/rules/person/_PeoplePublic.py b/src/gen/filters/rules/person/_peoplepublic.py
similarity index 100%
rename from src/gen/filters/rules/person/_PeoplePublic.py
rename to src/gen/filters/rules/person/_peoplepublic.py
diff --git a/src/gen/filters/rules/person/_PersonWithIncompleteEvent.py b/src/gen/filters/rules/person/_personwithincompleteevent.py
similarity index 100%
rename from src/gen/filters/rules/person/_PersonWithIncompleteEvent.py
rename to src/gen/filters/rules/person/_personwithincompleteevent.py
diff --git a/src/gen/filters/rules/person/_ProbablyAlive.py b/src/gen/filters/rules/person/_probablyalive.py
similarity index 100%
rename from src/gen/filters/rules/person/_ProbablyAlive.py
rename to src/gen/filters/rules/person/_probablyalive.py
diff --git a/src/gen/filters/rules/person/_RegExpIdOf.py b/src/gen/filters/rules/person/_regexpidof.py
similarity index 100%
rename from src/gen/filters/rules/person/_RegExpIdOf.py
rename to src/gen/filters/rules/person/_regexpidof.py
diff --git a/src/gen/filters/rules/person/_RegExpName.py b/src/gen/filters/rules/person/_regexpname.py
similarity index 100%
rename from src/gen/filters/rules/person/_RegExpName.py
rename to src/gen/filters/rules/person/_regexpname.py
diff --git a/src/gen/filters/rules/person/_RelationshipPathBetween.py b/src/gen/filters/rules/person/_relationshippathbetween.py
similarity index 100%
rename from src/gen/filters/rules/person/_RelationshipPathBetween.py
rename to src/gen/filters/rules/person/_relationshippathbetween.py
diff --git a/src/gen/filters/rules/person/_RelationshipPathBetweenBookmarks.py b/src/gen/filters/rules/person/_relationshippathbetweenbookmarks.py
similarity index 100%
rename from src/gen/filters/rules/person/_RelationshipPathBetweenBookmarks.py
rename to src/gen/filters/rules/person/_relationshippathbetweenbookmarks.py
diff --git a/src/gen/filters/rules/person/_SearchName.py b/src/gen/filters/rules/person/_searchname.py
similarity index 100%
rename from src/gen/filters/rules/person/_SearchName.py
rename to src/gen/filters/rules/person/_searchname.py
diff --git a/src/gen/filters/rules/place/Makefile.am b/src/gen/filters/rules/place/Makefile.am
index fe9988c11..a05db522c 100644
--- a/src/gen/filters/rules/place/Makefile.am
+++ b/src/gen/filters/rules/place/Makefile.am
@@ -4,21 +4,21 @@
 pkgpythondir = $(datadir)/@PACKAGE@/gen/filters/rules/place
 
 pkgpython_PYTHON = \
-	_AllPlaces.py\
-	_ChangedSince.py\
-	_HasIdOf.py\
-	_HasNoLatOrLon.py\
-	_InLatLonNeighborhood.py\
-	_HasGallery.py \
-	_HasNoteMatchingSubstringOf.py\
-	_HasNoteRegexp.py\
-	_HasPlace.py\
-	_HasNote.py \
-	_HasReferenceCountOf.py\
-	_MatchesFilter.py\
-	_MatchesEventFilter.py\
-	_PlacePrivate.py\
-	_RegExpIdOf.py\
+	_allplaces.py\
+	_changedsince.py\
+	_hasidof.py\
+	_hasnolatorlon.py\
+	_inlatlonneighborhood.py\
+	_hasgallery.py \
+	_hasnotematchingsubstringof.py\
+	_hasnoteregexp.py\
+	_hasplace.py\
+	_hasnote.py \
+	_hasreferencecountof.py\
+	_matchesfilter.py\
+	_matcheseventfilter.py\
+	_placeprivate.py\
+	_regexpidof.py\
 	__init__.py
 
 pkgpyexecdir = @pkgpyexecdir@/gen/filters/rules/place
diff --git a/src/gen/filters/rules/place/__init__.py b/src/gen/filters/rules/place/__init__.py
index d138b382c..a427ee0b0 100644
--- a/src/gen/filters/rules/place/__init__.py
+++ b/src/gen/filters/rules/place/__init__.py
@@ -25,21 +25,21 @@
 Package providing filter rules for GRAMPS.
 """
 
-from _AllPlaces import AllPlaces
-from _HasGallery import HasGallery
-from _HasIdOf import HasIdOf
-from _RegExpIdOf import RegExpIdOf
-from _HasNote import HasNote
-from _HasNoteRegexp import HasNoteRegexp
-from _HasNoteMatchingSubstringOf import HasNoteMatchingSubstringOf
-from _HasReferenceCountOf import HasReferenceCountOf
-from _PlacePrivate import PlacePrivate
-from _MatchesFilter import MatchesFilter
-from _HasPlace import HasPlace
-from _HasNoLatOrLon import HasNoLatOrLon
-from _InLatLonNeighborhood import InLatLonNeighborhood
-from _MatchesEventFilter import MatchesEventFilter
-from _ChangedSince import ChangedSince
+from _allplaces import AllPlaces
+from _hasgallery import HasGallery
+from _hasidof import HasIdOf
+from _regexpidof import RegExpIdOf
+from _hasnote import HasNote
+from _hasnoteregexp import HasNoteRegexp
+from _hasnotematchingsubstringof import HasNoteMatchingSubstringOf
+from _hasreferencecountof import HasReferenceCountOf
+from _placeprivate import PlacePrivate
+from _matchesfilter import MatchesFilter
+from _hasplace import HasPlace
+from _hasnolatorlon import HasNoLatOrLon
+from _inlatlonneighborhood import InLatLonNeighborhood
+from _matcheseventfilter import MatchesEventFilter
+from _changedsince import ChangedSince
 
 editor_rule_list = [
     AllPlaces,
diff --git a/src/gen/filters/rules/place/_AllPlaces.py b/src/gen/filters/rules/place/_allplaces.py
similarity index 100%
rename from src/gen/filters/rules/place/_AllPlaces.py
rename to src/gen/filters/rules/place/_allplaces.py
diff --git a/src/gen/filters/rules/place/_ChangedSince.py b/src/gen/filters/rules/place/_changedsince.py
similarity index 100%
rename from src/gen/filters/rules/place/_ChangedSince.py
rename to src/gen/filters/rules/place/_changedsince.py
diff --git a/src/gen/filters/rules/place/_HasGallery.py b/src/gen/filters/rules/place/_hasgallery.py
similarity index 100%
rename from src/gen/filters/rules/place/_HasGallery.py
rename to src/gen/filters/rules/place/_hasgallery.py
diff --git a/src/gen/filters/rules/place/_HasIdOf.py b/src/gen/filters/rules/place/_hasidof.py
similarity index 100%
rename from src/gen/filters/rules/place/_HasIdOf.py
rename to src/gen/filters/rules/place/_hasidof.py
diff --git a/src/gen/filters/rules/place/_HasNoLatOrLon.py b/src/gen/filters/rules/place/_hasnolatorlon.py
similarity index 100%
rename from src/gen/filters/rules/place/_HasNoLatOrLon.py
rename to src/gen/filters/rules/place/_hasnolatorlon.py
diff --git a/src/gen/filters/rules/place/_HasNote.py b/src/gen/filters/rules/place/_hasnote.py
similarity index 100%
rename from src/gen/filters/rules/place/_HasNote.py
rename to src/gen/filters/rules/place/_hasnote.py
diff --git a/src/gen/filters/rules/place/_HasNoteMatchingSubstringOf.py b/src/gen/filters/rules/place/_hasnotematchingsubstringof.py
similarity index 100%
rename from src/gen/filters/rules/place/_HasNoteMatchingSubstringOf.py
rename to src/gen/filters/rules/place/_hasnotematchingsubstringof.py
diff --git a/src/gen/filters/rules/place/_HasNoteRegexp.py b/src/gen/filters/rules/place/_hasnoteregexp.py
similarity index 100%
rename from src/gen/filters/rules/place/_HasNoteRegexp.py
rename to src/gen/filters/rules/place/_hasnoteregexp.py
diff --git a/src/gen/filters/rules/place/_HasPlace.py b/src/gen/filters/rules/place/_hasplace.py
similarity index 100%
rename from src/gen/filters/rules/place/_HasPlace.py
rename to src/gen/filters/rules/place/_hasplace.py
diff --git a/src/gen/filters/rules/place/_HasReferenceCountOf.py b/src/gen/filters/rules/place/_hasreferencecountof.py
similarity index 100%
rename from src/gen/filters/rules/place/_HasReferenceCountOf.py
rename to src/gen/filters/rules/place/_hasreferencecountof.py
diff --git a/src/gen/filters/rules/place/_InLatLonNeighborhood.py b/src/gen/filters/rules/place/_inlatlonneighborhood.py
similarity index 100%
rename from src/gen/filters/rules/place/_InLatLonNeighborhood.py
rename to src/gen/filters/rules/place/_inlatlonneighborhood.py
diff --git a/src/gen/filters/rules/place/_MatchesEventFilter.py b/src/gen/filters/rules/place/_matcheseventfilter.py
similarity index 100%
rename from src/gen/filters/rules/place/_MatchesEventFilter.py
rename to src/gen/filters/rules/place/_matcheseventfilter.py
diff --git a/src/gen/filters/rules/place/_MatchesFilter.py b/src/gen/filters/rules/place/_matchesfilter.py
similarity index 100%
rename from src/gen/filters/rules/place/_MatchesFilter.py
rename to src/gen/filters/rules/place/_matchesfilter.py
diff --git a/src/gen/filters/rules/place/_PlacePrivate.py b/src/gen/filters/rules/place/_placeprivate.py
similarity index 100%
rename from src/gen/filters/rules/place/_PlacePrivate.py
rename to src/gen/filters/rules/place/_placeprivate.py
diff --git a/src/gen/filters/rules/place/_RegExpIdOf.py b/src/gen/filters/rules/place/_regexpidof.py
similarity index 100%
rename from src/gen/filters/rules/place/_RegExpIdOf.py
rename to src/gen/filters/rules/place/_regexpidof.py
diff --git a/src/gen/filters/rules/repository/Makefile.am b/src/gen/filters/rules/repository/Makefile.am
index 2aca2b279..4a3ef0a75 100644
--- a/src/gen/filters/rules/repository/Makefile.am
+++ b/src/gen/filters/rules/repository/Makefile.am
@@ -4,17 +4,17 @@
 pkgpythondir = $(datadir)/@PACKAGE@/gen/filters/rules/repository
 
 pkgpython_PYTHON = \
-	_AllRepos.py\
-	_ChangedSince.py\
-	_HasIdOf.py\
-	_HasNoteMatchingSubstringOf.py\
-	_HasNoteRegexp.py\
-	_HasReferenceCountOf.py\
-	_HasRepo.py\
-	_MatchesFilter.py\
-        _MatchesNameSubstringOf.py\
-	_RegExpIdOf.py\
-	_RepoPrivate.py\
+	_allrepos.py\
+	_changedsince.py\
+	_hasidof.py\
+	_hasnotematchingsubstringof.py\
+	_hasnoteregexp.py\
+	_hasreferencecountof.py\
+	_hasrepo.py\
+	_matchesfilter.py\
+        _matchesnamesubstringof.py\
+	_regexpidof.py\
+	_repoprivate.py\
 	__init__.py
 
 pkgpyexecdir = @pkgpyexecdir@/gen/filters/rules/repository
diff --git a/src/gen/filters/rules/repository/__init__.py b/src/gen/filters/rules/repository/__init__.py
index 8d354e8ee..326d34d62 100644
--- a/src/gen/filters/rules/repository/__init__.py
+++ b/src/gen/filters/rules/repository/__init__.py
@@ -24,17 +24,17 @@
 Package providing filter rules for GRAMPS.
 """
 
-from _AllRepos import AllRepos
-from _HasIdOf import HasIdOf
-from _RegExpIdOf import RegExpIdOf
-from _HasNoteRegexp import HasNoteRegexp
-from _HasNoteMatchingSubstringOf import HasNoteMatchingSubstringOf
-from _HasReferenceCountOf import HasReferenceCountOf
-from _RepoPrivate import RepoPrivate
-from _MatchesFilter import MatchesFilter
-from _HasRepo import HasRepo
-from _ChangedSince import ChangedSince
-from _MatchesNameSubstringOf import MatchesNameSubstringOf
+from _allrepos import AllRepos
+from _hasidof import HasIdOf
+from _regexpidof import RegExpIdOf
+from _hasnoteregexp import HasNoteRegexp
+from _hasnotematchingsubstringof import HasNoteMatchingSubstringOf
+from _hasreferencecountof import HasReferenceCountOf
+from _repoprivate import RepoPrivate
+from _matchesfilter import MatchesFilter
+from _hasrepo import HasRepo
+from _changedsince import ChangedSince
+from _matchesnamesubstringof import MatchesNameSubstringOf
 
 editor_rule_list = [
     AllRepos,
diff --git a/src/gen/filters/rules/repository/_AllRepos.py b/src/gen/filters/rules/repository/_allrepos.py
similarity index 100%
rename from src/gen/filters/rules/repository/_AllRepos.py
rename to src/gen/filters/rules/repository/_allrepos.py
diff --git a/src/gen/filters/rules/repository/_ChangedSince.py b/src/gen/filters/rules/repository/_changedsince.py
similarity index 100%
rename from src/gen/filters/rules/repository/_ChangedSince.py
rename to src/gen/filters/rules/repository/_changedsince.py
diff --git a/src/gen/filters/rules/repository/_HasIdOf.py b/src/gen/filters/rules/repository/_hasidof.py
similarity index 100%
rename from src/gen/filters/rules/repository/_HasIdOf.py
rename to src/gen/filters/rules/repository/_hasidof.py
diff --git a/src/gen/filters/rules/repository/_HasNoteMatchingSubstringOf.py b/src/gen/filters/rules/repository/_hasnotematchingsubstringof.py
similarity index 100%
rename from src/gen/filters/rules/repository/_HasNoteMatchingSubstringOf.py
rename to src/gen/filters/rules/repository/_hasnotematchingsubstringof.py
diff --git a/src/gen/filters/rules/repository/_HasNoteRegexp.py b/src/gen/filters/rules/repository/_hasnoteregexp.py
similarity index 100%
rename from src/gen/filters/rules/repository/_HasNoteRegexp.py
rename to src/gen/filters/rules/repository/_hasnoteregexp.py
diff --git a/src/gen/filters/rules/repository/_HasReferenceCountOf.py b/src/gen/filters/rules/repository/_hasreferencecountof.py
similarity index 100%
rename from src/gen/filters/rules/repository/_HasReferenceCountOf.py
rename to src/gen/filters/rules/repository/_hasreferencecountof.py
diff --git a/src/gen/filters/rules/repository/_HasRepo.py b/src/gen/filters/rules/repository/_hasrepo.py
similarity index 100%
rename from src/gen/filters/rules/repository/_HasRepo.py
rename to src/gen/filters/rules/repository/_hasrepo.py
diff --git a/src/gen/filters/rules/repository/_MatchesFilter.py b/src/gen/filters/rules/repository/_matchesfilter.py
similarity index 100%
rename from src/gen/filters/rules/repository/_MatchesFilter.py
rename to src/gen/filters/rules/repository/_matchesfilter.py
diff --git a/src/gen/filters/rules/repository/_MatchesNameSubstringOf.py b/src/gen/filters/rules/repository/_matchesnamesubstringof.py
similarity index 100%
rename from src/gen/filters/rules/repository/_MatchesNameSubstringOf.py
rename to src/gen/filters/rules/repository/_matchesnamesubstringof.py
diff --git a/src/gen/filters/rules/repository/_RegExpIdOf.py b/src/gen/filters/rules/repository/_regexpidof.py
similarity index 100%
rename from src/gen/filters/rules/repository/_RegExpIdOf.py
rename to src/gen/filters/rules/repository/_regexpidof.py
diff --git a/src/gen/filters/rules/repository/_RepoPrivate.py b/src/gen/filters/rules/repository/_repoprivate.py
similarity index 100%
rename from src/gen/filters/rules/repository/_RepoPrivate.py
rename to src/gen/filters/rules/repository/_repoprivate.py
diff --git a/src/gen/filters/rules/source/Makefile.am b/src/gen/filters/rules/source/Makefile.am
index b4b0256b5..79ded4332 100644
--- a/src/gen/filters/rules/source/Makefile.am
+++ b/src/gen/filters/rules/source/Makefile.am
@@ -4,22 +4,22 @@
 pkgpythondir = $(datadir)/@PACKAGE@/gen/filters/rules/source
 
 pkgpython_PYTHON = \
-	_ChangedSince.py\
-	_MatchesFilter.py\
-	_SourcePrivate.py\
-	_RegExpIdOf.py\
-	_HasGallery.py \
-	_HasNoteMatchingSubstringOf.py\
-	_HasReferenceCountOf.py\
-	_AllSources.py\
-	_HasIdOf.py\
-	_HasNote.py \
-	_HasNoteRegexp.py\
-	_HasRepository.py\
+	_changedsince.py\
+	_matchesfilter.py\
+	_sourceprivate.py\
+	_regexpidof.py\
+	_hasgallery.py \
+	_hasnotematchingsubstringof.py\
+	_hasreferencecountof.py\
+	_allsources.py\
+	_hasidof.py\
+	_hasnote.py \
+	_hasnoteregexp.py\
+	_hasrepository.py\
 	__init__.py\
-        _MatchesTitleSubstringOf.py\
-        _HasRepositoryCallNumberRef.py\
-        _MatchesRepositoryFilter.py
+        _matchestitlesubstringof.py\
+        _hasrepositorycallnumberref.py\
+        _matchesrepositoryfilter.py
 
 pkgpyexecdir = @pkgpyexecdir@/gen/filters/rules/source
 
diff --git a/src/gen/filters/rules/source/__init__.py b/src/gen/filters/rules/source/__init__.py
index aeb343eff..640477a2d 100644
--- a/src/gen/filters/rules/source/__init__.py
+++ b/src/gen/filters/rules/source/__init__.py
@@ -26,23 +26,23 @@
 Package providing filter rules for GRAMPS.
 """
 
-from gen.filters.rules._HasSourceBase import HasSourceBase as HasSource
+from gen.filters.rules._hassourcebase import HasSourceBase as HasSource
 
-from _AllSources import AllSources
-from _HasGallery import HasGallery
-from _HasIdOf import HasIdOf
-from _RegExpIdOf import RegExpIdOf
-from _HasNote import HasNote
-from _HasNoteRegexp import HasNoteRegexp
-from _HasNoteMatchingSubstringOf import HasNoteMatchingSubstringOf
-from _HasReferenceCountOf import HasReferenceCountOf
-from _SourcePrivate import SourcePrivate
-from _MatchesFilter import MatchesFilter
-from _ChangedSince import ChangedSince
-from _HasRepository import HasRepository
-from _MatchesTitleSubstringOf import MatchesTitleSubstringOf
-from _HasRepositoryCallNumberRef import HasRepositoryCallNumberRef
-from _MatchesRepositoryFilter import MatchesRepositoryFilter
+from _allsources import AllSources
+from _hasgallery import HasGallery
+from _hasidof import HasIdOf
+from _regexpidof import RegExpIdOf
+from _hasnote import HasNote
+from _hasnoteregexp import HasNoteRegexp
+from _hasnotematchingsubstringof import HasNoteMatchingSubstringOf
+from _hasreferencecountof import HasReferenceCountOf
+from _sourceprivate import SourcePrivate
+from _matchesfilter import MatchesFilter
+from _changedsince import ChangedSince
+from _hasrepository import HasRepository
+from _matchestitlesubstringof import MatchesTitleSubstringOf
+from _hasrepositorycallnumberref import HasRepositoryCallNumberRef
+from _matchesrepositoryfilter import MatchesRepositoryFilter
 
 editor_rule_list = [
     AllSources,
diff --git a/src/gen/filters/rules/source/_AllSources.py b/src/gen/filters/rules/source/_allsources.py
similarity index 100%
rename from src/gen/filters/rules/source/_AllSources.py
rename to src/gen/filters/rules/source/_allsources.py
diff --git a/src/gen/filters/rules/source/_ChangedSince.py b/src/gen/filters/rules/source/_changedsince.py
similarity index 100%
rename from src/gen/filters/rules/source/_ChangedSince.py
rename to src/gen/filters/rules/source/_changedsince.py
diff --git a/src/gen/filters/rules/source/_HasGallery.py b/src/gen/filters/rules/source/_hasgallery.py
similarity index 100%
rename from src/gen/filters/rules/source/_HasGallery.py
rename to src/gen/filters/rules/source/_hasgallery.py
diff --git a/src/gen/filters/rules/source/_HasIdOf.py b/src/gen/filters/rules/source/_hasidof.py
similarity index 100%
rename from src/gen/filters/rules/source/_HasIdOf.py
rename to src/gen/filters/rules/source/_hasidof.py
diff --git a/src/gen/filters/rules/source/_HasNote.py b/src/gen/filters/rules/source/_hasnote.py
similarity index 100%
rename from src/gen/filters/rules/source/_HasNote.py
rename to src/gen/filters/rules/source/_hasnote.py
diff --git a/src/gen/filters/rules/source/_HasNoteMatchingSubstringOf.py b/src/gen/filters/rules/source/_hasnotematchingsubstringof.py
similarity index 100%
rename from src/gen/filters/rules/source/_HasNoteMatchingSubstringOf.py
rename to src/gen/filters/rules/source/_hasnotematchingsubstringof.py
diff --git a/src/gen/filters/rules/source/_HasNoteRegexp.py b/src/gen/filters/rules/source/_hasnoteregexp.py
similarity index 100%
rename from src/gen/filters/rules/source/_HasNoteRegexp.py
rename to src/gen/filters/rules/source/_hasnoteregexp.py
diff --git a/src/gen/filters/rules/source/_HasReferenceCountOf.py b/src/gen/filters/rules/source/_hasreferencecountof.py
similarity index 100%
rename from src/gen/filters/rules/source/_HasReferenceCountOf.py
rename to src/gen/filters/rules/source/_hasreferencecountof.py
diff --git a/src/gen/filters/rules/source/_HasRepository.py b/src/gen/filters/rules/source/_hasrepository.py
similarity index 100%
rename from src/gen/filters/rules/source/_HasRepository.py
rename to src/gen/filters/rules/source/_hasrepository.py
diff --git a/src/gen/filters/rules/source/_HasRepositoryCallNumberRef.py b/src/gen/filters/rules/source/_hasrepositorycallnumberref.py
similarity index 100%
rename from src/gen/filters/rules/source/_HasRepositoryCallNumberRef.py
rename to src/gen/filters/rules/source/_hasrepositorycallnumberref.py
diff --git a/src/gen/filters/rules/source/_MatchesFilter.py b/src/gen/filters/rules/source/_matchesfilter.py
similarity index 100%
rename from src/gen/filters/rules/source/_MatchesFilter.py
rename to src/gen/filters/rules/source/_matchesfilter.py
diff --git a/src/gen/filters/rules/source/_MatchesRepositoryFilter.py b/src/gen/filters/rules/source/_matchesrepositoryfilter.py
similarity index 100%
rename from src/gen/filters/rules/source/_MatchesRepositoryFilter.py
rename to src/gen/filters/rules/source/_matchesrepositoryfilter.py
diff --git a/src/gen/filters/rules/source/_MatchesTitleSubstringOf.py b/src/gen/filters/rules/source/_matchestitlesubstringof.py
similarity index 100%
rename from src/gen/filters/rules/source/_MatchesTitleSubstringOf.py
rename to src/gen/filters/rules/source/_matchestitlesubstringof.py
diff --git a/src/gen/filters/rules/source/_RegExpIdOf.py b/src/gen/filters/rules/source/_regexpidof.py
similarity index 100%
rename from src/gen/filters/rules/source/_RegExpIdOf.py
rename to src/gen/filters/rules/source/_regexpidof.py
diff --git a/src/gen/filters/rules/source/_SourcePrivate.py b/src/gen/filters/rules/source/_sourceprivate.py
similarity index 100%
rename from src/gen/filters/rules/source/_SourcePrivate.py
rename to src/gen/filters/rules/source/_sourceprivate.py
diff --git a/src/gui/filters/Makefile.am b/src/gui/filters/Makefile.am
index 356f1c53e..d967df1ec 100644
--- a/src/gui/filters/Makefile.am
+++ b/src/gui/filters/Makefile.am
@@ -6,11 +6,11 @@ SUBDIRS = sidebar
 pkgpythondir = $(datadir)/@PACKAGE@/gui/filters
 
 pkgpython_PYTHON = \
-	_FilterComboBox.py \
-	_FilterMenu.py \
-	_FilterStore.py \
+	_filtercombobox.py \
+	_filtermenu.py \
+	_filterstore.py \
 	__init__.py \
-	_SearchBar.py
+	_searchbar.py
 
 pkgpyexecdir = @pkgpyexecdir@/gui/filters
 
diff --git a/src/gui/filters/__init__.py b/src/gui/filters/__init__.py
index fccd0111e..51cf6fcb7 100644
--- a/src/gui/filters/__init__.py
+++ b/src/gui/filters/__init__.py
@@ -24,7 +24,7 @@
 Package providing filtering framework for GRAMPS.
 """
 
-from _FilterComboBox import FilterComboBox
-from _FilterMenu import build_filter_model
-from _FilterStore import FilterStore
-from _SearchBar import SearchBar
+from _filtercombobox import FilterComboBox
+from _filtermenu import build_filter_model
+from _filterstore import FilterStore
+from _searchbar import SearchBar
diff --git a/src/gui/filters/_FilterComboBox.py b/src/gui/filters/_filtercombobox.py
similarity index 100%
rename from src/gui/filters/_FilterComboBox.py
rename to src/gui/filters/_filtercombobox.py
diff --git a/src/gui/filters/_FilterMenu.py b/src/gui/filters/_filtermenu.py
similarity index 100%
rename from src/gui/filters/_FilterMenu.py
rename to src/gui/filters/_filtermenu.py
diff --git a/src/gui/filters/_FilterStore.py b/src/gui/filters/_filterstore.py
similarity index 100%
rename from src/gui/filters/_FilterStore.py
rename to src/gui/filters/_filterstore.py
diff --git a/src/gui/filters/_SearchBar.py b/src/gui/filters/_searchbar.py
similarity index 100%
rename from src/gui/filters/_SearchBar.py
rename to src/gui/filters/_searchbar.py
diff --git a/src/gui/filters/sidebar/Makefile.am b/src/gui/filters/sidebar/Makefile.am
index e5dbb6dfc..3bc4781de 100644
--- a/src/gui/filters/sidebar/Makefile.am
+++ b/src/gui/filters/sidebar/Makefile.am
@@ -4,17 +4,17 @@
 pkgpythondir = $(datadir)/@PACKAGE@/gui/filters/sidebar
 
 pkgpython_PYTHON = \
-	_EventSidebarFilter.py \
-	_FamilySidebarFilter.py \
+	_eventsidebarfilter.py \
+	_familysidebarfilter.py \
 	__init__.py \
-	_SidebarFilter.py \
-	_PersonSidebarFilter.py\
-	_SourceSidebarFilter.py\
-	_CitationSidebarFilter.py\
-	_PlaceSidebarFilter.py\
-	_MediaSidebarFilter.py\
-	_RepoSidebarFilter.py\
-	_NoteSidebarFilter.py
+	_sidebarfilter.py \
+	_personsidebarfilter.py\
+	_sourcesidebarfilter.py\
+	_citationsidebarfilter.py\
+	_placesidebarfilter.py\
+	_mediasidebarfilter.py\
+	_reposidebarfilter.py\
+	_notesidebarfilter.py
 
 pkgpyexecdir = @pkgpyexecdir@/gui/filters/sidebar
 
diff --git a/src/gui/filters/sidebar/__init__.py b/src/gui/filters/sidebar/__init__.py
index 86498f51e..dc2b65bb4 100644
--- a/src/gui/filters/sidebar/__init__.py
+++ b/src/gui/filters/sidebar/__init__.py
@@ -25,13 +25,13 @@
 Package providing sidebar filters for GRAMPS.
 """
 
-from _SidebarFilter import SidebarFilter
-from _PersonSidebarFilter import PersonSidebarFilter
-from _FamilySidebarFilter import FamilySidebarFilter
-from _EventSidebarFilter import EventSidebarFilter
-from _SourceSidebarFilter import SourceSidebarFilter
-from _CitationSidebarFilter import CitationSidebarFilter
-from _PlaceSidebarFilter import PlaceSidebarFilter
-from _MediaSidebarFilter import MediaSidebarFilter
-from _RepoSidebarFilter import RepoSidebarFilter
-from _NoteSidebarFilter import NoteSidebarFilter
+from _sidebarfilter import SidebarFilter
+from _personsidebarfilter import PersonSidebarFilter
+from _familysidebarfilter import FamilySidebarFilter
+from _eventsidebarfilter import EventSidebarFilter
+from _sourcesidebarfilter import SourceSidebarFilter
+from _citationsidebarfilter import CitationSidebarFilter
+from _placesidebarfilter import PlaceSidebarFilter
+from _mediasidebarfilter import MediaSidebarFilter
+from _reposidebarfilter import RepoSidebarFilter
+from _notesidebarfilter import NoteSidebarFilter
diff --git a/src/gui/filters/sidebar/_CitationSidebarFilter.py b/src/gui/filters/sidebar/_citationsidebarfilter.py
similarity index 100%
rename from src/gui/filters/sidebar/_CitationSidebarFilter.py
rename to src/gui/filters/sidebar/_citationsidebarfilter.py
diff --git a/src/gui/filters/sidebar/_EventSidebarFilter.py b/src/gui/filters/sidebar/_eventsidebarfilter.py
similarity index 100%
rename from src/gui/filters/sidebar/_EventSidebarFilter.py
rename to src/gui/filters/sidebar/_eventsidebarfilter.py
diff --git a/src/gui/filters/sidebar/_FamilySidebarFilter.py b/src/gui/filters/sidebar/_familysidebarfilter.py
similarity index 100%
rename from src/gui/filters/sidebar/_FamilySidebarFilter.py
rename to src/gui/filters/sidebar/_familysidebarfilter.py
diff --git a/src/gui/filters/sidebar/_MediaSidebarFilter.py b/src/gui/filters/sidebar/_mediasidebarfilter.py
similarity index 100%
rename from src/gui/filters/sidebar/_MediaSidebarFilter.py
rename to src/gui/filters/sidebar/_mediasidebarfilter.py
diff --git a/src/gui/filters/sidebar/_NoteSidebarFilter.py b/src/gui/filters/sidebar/_notesidebarfilter.py
similarity index 100%
rename from src/gui/filters/sidebar/_NoteSidebarFilter.py
rename to src/gui/filters/sidebar/_notesidebarfilter.py
diff --git a/src/gui/filters/sidebar/_PersonSidebarFilter.py b/src/gui/filters/sidebar/_personsidebarfilter.py
similarity index 100%
rename from src/gui/filters/sidebar/_PersonSidebarFilter.py
rename to src/gui/filters/sidebar/_personsidebarfilter.py
diff --git a/src/gui/filters/sidebar/_PlaceSidebarFilter.py b/src/gui/filters/sidebar/_placesidebarfilter.py
similarity index 100%
rename from src/gui/filters/sidebar/_PlaceSidebarFilter.py
rename to src/gui/filters/sidebar/_placesidebarfilter.py
diff --git a/src/gui/filters/sidebar/_RepoSidebarFilter.py b/src/gui/filters/sidebar/_reposidebarfilter.py
similarity index 100%
rename from src/gui/filters/sidebar/_RepoSidebarFilter.py
rename to src/gui/filters/sidebar/_reposidebarfilter.py
diff --git a/src/gui/filters/sidebar/_SidebarFilter.py b/src/gui/filters/sidebar/_sidebarfilter.py
similarity index 100%
rename from src/gui/filters/sidebar/_SidebarFilter.py
rename to src/gui/filters/sidebar/_sidebarfilter.py
diff --git a/src/gui/filters/sidebar/_SourceSidebarFilter.py b/src/gui/filters/sidebar/_sourcesidebarfilter.py
similarity index 100%
rename from src/gui/filters/sidebar/_SourceSidebarFilter.py
rename to src/gui/filters/sidebar/_sourcesidebarfilter.py