Throw exception for type classification
Fix accepting identifiers starting/ending with underscore