Fixed improperly named variables/methods