fixed fleet services and startup scripts to cater for naming conventions. Spark does not work if _ is used in its node names. So, - hyphen is used