Fix silly grammar errors
Resolve symbol matching conflicts