Changed codes and name in some cases