Rename parameters

@nexus-uw Please review. Thx.