Improves ordering
Fixes a critical name error