finishing up refactoring of naming.  Attempt to put in placement as
well, although it might be wacky?