Fixed xpath expressions with proper name handling.