a touch of cleanup and name changes.