Rename DealPhaseState back to DealPhase.
Rename DeclarationPhaseState back to DeclarationPhase.
Rename ExchangePhaseState back to ExchangePhase.
Rename TrickPhaseState back to TrickPhase.
Clean up whitespace after class name changes.