Fix name errors moving machines