Reworked oglwrap's naming convention.