Added name auditing for all view types