Uses the canonial names of the classes instead of hard coded strings

this access
re arrange code