User editing has security checks added and new naming scheme applied