Rename machine to executor, replica to group