Change struct name with less characters
Enhancement to avoid array overflowing