Normalize towards stl-like names/usages