Resolved naming weirdness