Better name management