Rename machine definitions to be concise and terse