Updated file name and renamed methods