update naming order