change variable names
adapt tests after legacy change
update exported files