changed regex group method names