Nomenclature out of date and confusing.

[Eurybiadan]

Need to update variable names to avoid confusion.