Changed import functions due to file renames