Simplified peer error handling and general cleanup of names.