rename definitions to use vbmachine pattern