Rename layout -> container