Minor fiddling with naming.