[TASK] Change to support new TypoScript naming conventions