Parameter names

Updating parameter names to match structure write-up and avoid
confusion.