Better name formatting