More root name cleanup