GT-22 Version 1.1
- Rename methods