STY/ENH: Remove default dict and change names

It was pointed out that defaultdictionaries were not needed and that
some function names were rather confusing.