Revert to TSMessageAdapterType for naming to avoid conflicts