renaming variables, trying to set some standardized structure