Updated all value keys to match project