use suffix X consistently for all non-generated wrapper classes
rename missing classes to suffix X