Cleaned up WSplit parser rule names a bit