UPDATED: Eluna

Renamed a couple methods