Renaming of classification helper classes