fixing the name mess
yet more name fixes
more namefixes
more name bugfixes
more name bugfixes