STYLE: correct naming of the layouts and the corresponding variable names

see #66