fix: revert type updates

[roleyfoley]

Description

Some minor changes to revert Type configuration on properties which weren't part of the getCompositeObject type updates in #1514

Motivation and Context

The Type properties in this PR are not used during getCompositeObject processing so should still be kept as the singular Type to maintain compatibility with their usage

How Has This Been Tested?

Tested locally

Types of changes

• Bug fix (non-breaking change which fixes an issue)
• Refactor (non-breaking change which improves the structure or operation of the implementation)
• New feature (non-breaking change which adds functionality)
• Breaking change (fix or feature that would cause existing functionality to change)

Followup Actions

• None

Checklist:

• My change requires a change to the documentation.
• I have updated the documentation accordingly.
• I have added tests to cover my changes.
• All new and existing tests passed.
• None of the above.