Removing hard-coding of curve name