Changing name to more standard format