Change 'machine' to 'server'; fixes #571