Moar tweaks

Attempts to be more specific and consistent with terminology