Issue #376. Added $ to all identifier definitions