=str #16380 Cleaned up Source/Sink/Key overlap

Refs #16380