GII generated files changes according to PSR2