naming update + fixed space handling