Simplify layout naming.