Improved performance of list items naming way
Merge branch 'starlight'