[BUGFIX] Adjust file, layout and section names