Fixed imports

Try the old name, use the new if it misses. refs #102