PrefixMap renamed to PrefixDict.
Unit tests for PrefixDict added.