Outsource parts and remove version from name