GL: fix naming conventions