cleanup and a test of new shorter names