Merge pull request #1874 from eeshangarg/starter-project-1870-2

Replace the remaining occurrences of six.u with the u prefix