Changed some device codenames