Update paths to new naming scheme