Refactored GF classes to use same naming convention