Fixing class name in measure to match what is expected