Fixed confusing names