Make FQN's work in both backends