Changes property names.

I'm not sure if the old ones made much sense.
Can limit the number of units displayed.