Fixed incorrect token names that used the historical name of the system in the bundled plain template