REFACTOR: Renamed a few more functions