Fixed name formating