Proper naming to hashmap