Some rules in RegExp syntax renamed
Clean up in XML's syntax