Fixing advanced namings