UP/ADD: Initial shuffle after rename to declass