Some naming cleanup -- apologies if this breaks anyone.  There is no removal of functionality, just some renaming...