[FIXUP] Minor fixes

Minor fixes in layout and naming.