Align code headers definition and rename block variable