Fixed all references to HashMapInterface