Renames and fixes.  All tests working again.  'complete' with shapes needs more testing.