Change user_name, group_name to username, groupname

Various type changes.