Changed custom field variables to not use leading zeros
That means e.g. custom01 -> custom1