Changed context variables to match the layout name

BASIC-912