Overlay changes

Reviewers: @donovanhide, @ximinez, @rec
Redefinition of typedef on line 51