Get rid of adaptations as they are and then transfer them to a race each like you said above. Mundungus are trolls, ogres are mamlauk, kobolds or goblins are skrugga, and orcs are shig-ru.