Fixup force root naming strategy