You should be fine.

However, with something this important, I would call Marriott just to verify that I have all my paperwork in order, just to give you peace of mind. Make sure to order the paper certs if you haven't alreay got them in hand.

Also, when you call, confirm that you do/do not have upgrades reserved, and get the proper upgrade certs ordered if necessary.

Better to confirm your details through Marriott than to arrive at the hotel and be surprised.

Have a great time!