Fix mock config directories

This commit fixes the mock config directories and adds a variable for the mock name
so that things are correctly instantiated.