Better name inference