cleanup: Use const values to handle layout / entries well known values and generate strings instead of hardcoding them

cleanup: Use const values to handle layout / entries well known values and generate strings instead of hardcoding them #2008