Corrected comments and naming