Merge "naming changes" into testing