further adjusted cloud sw naming convention