Merge "DO NOT MERGE Rename classes to match master" into qt-qpr1-dev