#48: coherent namespace use