Values: Rename wrong named folders

Change-Id: Ida66a7fb94f0f57c2f8f201303d80c929863525a