Many renames, simplifies Alignment.