minor: changed namings