Updated the methods names to be more consitant