BuildBundle: remove /Primary naming convention