Only get Source and Target Names if needed

Only get source and target names if needed