Set correct variable names