Use 'name' by default and 'parameter' only when requested. Fixes #272