changed regexp scope identifier to follow TM conventions
TODO: review other identifiers ?