Apex: Fixes regexp to match label names as well