Added the names of the modules to the function names.#58