Rename value variants, remove environment field from lambda