Update Models to use FQNs