cosmetic rename
merge default into bug25191
and some tiny refactoring