Renamed some functions for clarification
Renamed functions for clarity.