#134: fixed namespace occurences