codegen now supports variable class suffixes.