LayeredEncoder: followed recent renamings.