Fixed name formatting