Naming convention Builder subpackage, close #2