Added ability to separate name of fact from define name