Make "Default" the default
Add rename-threshold test