Did some renaming and comment tweaks
Merge branch 'tweaks'; nothing major