remove "Default" from the name since it makes no sense.
(pre-approved by Jeff)
remove "Default" from the names
remove "Default" from the names