Rework building: VMS changes to handle extensions and product names