[BUGFIX] Allow names with space char