Name cleanups.  First testing of application