Naming convention refactor

[pvinthemix]

Look at the issues below for more information around naming convention changes:

• https://github.com/shannonmoranetz/mentalitea/issues/31
• https://github.com/shannonmoranetz/mentalitea/issues/32
• https://github.com/shannonmoranetz/mentalitea/issues/33
• https://github.com/shannonmoranetz/mentalitea/issues/34