small fixes
mainly renaming