Rename xtype, wrong name uses