Scheme renamed to conform to target