Changed external function names to fully qualified function names