Move recent deprecated keys to the right place...