Reworked the oglwrap naming convention.