Renamed methods to proper names

- Renamed methods to proper names
- Commented out test codes