Adapt to skeleton nomenclature