[0567] Applied name formatting to previous pull-request