Changed FQN strategy to simplify refactoring.