Bugfix: support for "_" in property and class names