Merge "Change getCanonicalName to getName in models"