conventioning patch 4

-naming
-finalizing