revert names to dan's spec