Change namings a little bit.