rename partials for hierarchy consistency