Fix new namings