MYLOC-119 - Fixing class names