re-ordered decks and renaming