Also changed some filenames to match the requirement which is to have the same name than the blueprint. Change-Id: Ief213c619a960e1248593b3d31a91d19e1267f36
Also changed some filenames to match the requirement which is to have the same name than the blueprint. Change-Id: Ief213c619a960e1248593b3d31a91d19e1267f36