Fix up namespacing issues
Console shell