Change to new format syntax.