Rename and tweak site yaml contents

Both of these changes should be safe to make before making any changes to Transition and Bouncer as they are ignoring these fields.