yaffs Merge branch 'namechange'