R: rename layout functions, #688