Renamed Functions

- Renamed functions more "directly" as possible