Fixed paths.
Issue #2358887 by eshta: Add optional replace argument to machine name generation.