Renaming hashmap to map