Modify naming structure to use "1st" and "2nd", Update bootargs