Updated paths to be inline with #8240