Add G8 class prefix

Refactoring related to #90