Improved naming, fixed bug in non-network straggler calculation