borefield: cleaning + renaming of variables