Fixed improper class naming by incorrect removing all numeric characters and fixed general null warnings