Added proper name to WGAFD