update namings and tests