Fixing up some terminology.