fixes and renames