Merge "Class renaming didn't went into change 12729"