Changed getCanonicalName() to getName()