Added name formatting for prefix/suffix