Although the variable usage is wrong, should we be preserving class suffixes in the new template?