naming updates for aas context variables