conventioning patch 6

-edited terms
-formatting