Class name improvements#19

mecha wants to merge 3 commits into

0.1.xDhii/services:0.1.xfrom

refactor/name-improvementsDhii/services:refactor/name-improvementsCopy head branch name to clipboard