Fix names. No spaces are acceptables