cleanup for name change