Get rid of FQNs