naming changes and cloud services added