fix variable namings