namespace changes, inline functions