Improve naming of classes to identify better with intention

Uncategorized