Fix multiple namespace support
Rename Dictionary -> DictionaryOf