Changes Made to deal with trailing "CRUD" characters and name matching.