fix layout variables not following naming convention