Added defaultComponentName to a few models