more fixes and renames