modify function/var names