fix incorrect names, cleanup.