- fix variable names