Fixed the name and type arrtibute values for generic/group objects