Merge "Rename Environment method to follow attribute." into qt-dev