Refactor out G- Prefix from method names