rename some files / vars to make more sense