Small refactoring
Fix robot name check