A few variables renamed in InstantiationDecorators