Simplify spreading logic
Remove testing name change and non-functional reflection code.