changed some names and maintained some old code

changed all the strings to be evaluated code to prevent null pointer
exceptions.