Allow default type's to contain underscores.

Fixes LP Bug #1188786.

Change-Id: I2ff2b4abc88ca914220a7de1fa0ef05a6105b9c1