update to latest legacy and naming