renaming, reorganizing, basic definitions