Better handling of name prefixes using class addin
Better name-prefix