Adjust property/parameter names to match between classes

Some parameters and properties are given different names in different classes. It would likely be much easier for users if these names are adjusted to be the same everywhere.