Add better diagnostics info on failure. Ensure builder methods naming
follows conventions
Fix due to change in AString matcher to correctly follow the ant pattern