Added type name compatibility

Change-Id: I21c1fce3608358bf7554ef09c00a7c8c4168fa0d