Add prefix to struct types
Make condition to detect structs a little bit more general